[Tests] Update GHA to run all tests

examples/advanced_features/fixtures.tfvars

@@ -1,4 +1,3 @@
-enabled   = true
 namespace = "eg"
 name      = "incident-management-workflow"
 stage     = "test"

examples/alert_policy/fixtures.tfvars

@@ -1,4 +1,3 @@
-enabled   = true
 namespace = "eg"
 name      = "alert-policy"
 stage     = "test"

examples/config/fixtures.tfvars

@@ -1 +0,0 @@
-enabled = true

examples/config/resources/escalations.yaml

@@ -2,7 +2,8 @@ escalations:
 - name: acme.dev.some-service-escalation
   description: "repo: https://github.com/acme/some-service;owner:David Lightman @David Lightman"
   owner_team_name: acme.dev
-  rule:
+  # please note - config uses `rules` but escalation modules uses `rule`
+  rules:
     condition: if-not-acked
     notify_type: default
     delay: 0

examples/config/resources/notification_policies.yaml

@@ -2,7 +2,8 @@ notification_policies:
 - name: auto-close-based-on-priority
   team_name: acme.dev
   auto_close_action:
-    time_amount: 60
+    duration:
+      time_amount: 60
   filter:
     type: match-all-conditions
     conditions:
@@ -16,6 +17,17 @@ notification_policies:
       time_unit: minutes
       time_amount: 5
 
+- name: delay-action-test
+  team_name: acme.dev
+  auto_close_action:
+    duration:
+      time_amount: 60
+  filter:
+    type: match-all-conditions
+    conditions:
+      - field: priority
+        operation: less-than
+        expected_value: P3
   delay_action:
     delay_option: for-duration
     duration:

examples/config/resources/schedule_rotations.yaml

@@ -1,6 +1,6 @@
 schedule_rotations:
-  - name: acme.default.rotation
-    schedule_name: acme.default
+  - name:  acme.default.rotation
+    schedule_name: acme-default
     start_date: "1970-01-01T00:00:00Z"
     type: weekly
     length: 1
@@ -15,4 +15,4 @@ schedule_rotations:
       - start_hour: 8
         start_min: 0
         end_hour: 20
-        end_min: 0
+        end_min: 0

examples/config/resources/schedules.yaml

@@ -1,6 +1,6 @@
 schedules:
-  - name: acme.default
+  - name: acme-default
     description: "Acme Infrastructure Team"
     timezone: "America/Los_Angeles"
     owner_team_name: acme
-    enabled: true
+    enabled: true

examples/config/resources/users.yaml

@@ -4,3 +4,9 @@ users:
     role: User
     locale: "en_US"
     timezone: "America/New_York"
+
+  - username: opsgenie-test-2@cloudposse.com
+    full_name: Opsgenie Test User 2
+    role: User
+    locale: "en_US"
+    timezone: "America/New_York"

examples/escalation/fixtures.tfvars

@@ -1,4 +1,3 @@
-enabled   = true
 namespace = "eg"
 name      = "escalation"
 stage     = "test"

examples/escalation/main.tf

@@ -6,7 +6,7 @@ module "owner_team" {
   source = "../../modules/team"
 
   team = {
-    name        = "owner-team"
+    name        = format("%s-%s", module.this.id, "owner-team")
     description = "owner-team-description"
   }
 
@@ -17,7 +17,7 @@ module "escalation_team" {
   source = "../../modules/team"
 
   team = {
-    name        = "escalation-team"
+    name        = format("%s-%s", module.this.id, "escalation-team")
     description = "owner-team-description"
   }
 
@@ -39,5 +39,5 @@ module "escalation" {
     }
   }
 
-  context = module.this.contexts
+  context = module.this.context
 }

examples/integration_action/fixtures.tfvars

@@ -1,4 +1,3 @@
-enabled   = true
 namespace = "eg"
 name      = "integration"
 stage     = "test"

examples/notification_policy/fixtures.de_duplication_action.tfvars

@@ -0,0 +1,12 @@
+namespace = "eg"
+name      = "notification-policy"
+stage     = "test"
+
+de_duplication_action = {
+  de_duplication_action_type = "frequency-based"
+  count                      = 2
+  duration = {
+    time_unit   = "minutes"
+    time_amount = 5
+  }
+}

examples/notification_policy/fixtures.delay_action.tfvars

@@ -0,0 +1,12 @@
+namespace = "eg"
+name      = "notification-policy"
+stage     = "test"
+
+delay_action = {
+  delay_option = "for-duration"
+  duration = {
+    time_unit   = "minutes"
+    time_amount = 10
+  }
+}
+

examples/notification_policy/main.tf

@@ -6,7 +6,7 @@ module "team" {
   source = "../../modules/team"
 
   team = {
-    name        = "owner-team"
+    name        = module.this.id
     description = "owner-team-description"
   }
 
@@ -22,34 +22,34 @@ module "notification_policy" {
 
     filter = {
       type = "match-all-conditions"
-      conditions = [{
-        field          = "tags"
-        operation      = "contains"
-        expected_value = "recommendation:auto-close"
-      }]
+      conditions = [
+        {
+          field          = "tags"
+          operation      = "contains"
+          expected_value = "recommendation:auto-close"
+        }
+      ]
     }
 
-    de_duplication_action = {
-      de_duplication_action_type = "frequency-based"
-      count                      = 2
+    de_duplication_action = var.de_duplication_action
+    delay_action          = var.delay_action
+
+    auto_close_action = {
       duration = {
         time_unit   = "minutes"
         time_amount = 5
       }
     }
 
-    delay_action = {
-      delay_option = "for-duration"
+    auto_restart_action = {
       duration = {
         time_unit   = "minutes"
-        time_amount = 10
+        time_amount = 5
       }
+      max_repeat_count = 3
     }
 
-    auto_close_action = {
-      time_unit   = "minutes"
-      time_amount = 5
-    }
+    suppress = var.suppress
   }
 
   context = module.this.context

examples/notification_policy/variables.tf

@@ -3,3 +3,34 @@ variable "opsgenie_provider_api_key" {
   description = "The API Key for the Opsgenie Integration. If omitted, the OPSGENIE_API_KEY environment variable is used"
   default     = null
 }
+
+variable "de_duplication_action" {
+  type = object({
+    de_duplication_action_type = string
+    count                      = number
+    duration = object({
+      time_unit   = string
+      time_amount = number
+    })
+  })
+  description = "The de-duplication action for the notification policy"
+  default     = null
+}
+
+variable "delay_action" {
+  type = object({
+    delay_option = string
+    duration = object({
+      time_unit   = string
+      time_amount = number
+    })
+  })
+  description = "The delay action for the notification policy"
+  default     = null
+}
+
+variable "suppress" {
+  type        = bool
+  description = "The suppress flag for the notification policy"
+  default     = null
+}

examples/schedule/fixtures.tfvars

@@ -1,4 +1,3 @@
-enabled   = true
 namespace = "eg"
 name      = "schedule"
 stage     = "test"

examples/schedule/main.tf

@@ -6,7 +6,7 @@ module "owner_team" {
   source = "../../modules/team"
 
   team = {
-    name        = "owner-team"
+    name        = format("%s-%s", module.this.id, "owner-team")
     description = "owner-team-description"
   }
 

examples/team/fixtures.tfvars

@@ -1,4 +1,3 @@
-enabled   = true
 namespace = "eg"
 name      = "team"
 stage     = "test"

examples/team_routing_rule/fixtures.tfvars

@@ -1,4 +1,3 @@
-enabled   = true
 namespace = "eg"
 name      = "team-routing-rule"
 stage     = "test"

examples/team_routing_rule/main.tf

@@ -6,8 +6,8 @@ module "escalation_team" {
   source = "../../modules/team"
 
   team = {
-    name        = "escalation-team"
-    description = "owner-team-description"
+    name        = module.this.id
+    description = "escalation-team-description"
   }
 
   context = module.this.context
@@ -21,10 +21,12 @@ module "escalation" {
     owner_team_id = module.owner_team.team_id
 
     rule = {
-      recipients = [{
-        type = "team"
-        id   = module.escalation_team.team_id
-      }]
+      recipients = [
+        {
+          type = "team"
+          id   = module.escalation_team.team_id
+        }
+      ]
     }
   }
 
@@ -35,7 +37,7 @@ module "owner_team" {
   source = "../../modules/team"
 
   team = {
-    name        = "owner-team"
+    name        = format("%s-%s", module.this.id, "owner-team")
     description = "owner-team-description"
   }
 
@@ -58,12 +60,14 @@ module "team_routing_rule" {
 
     time_restriction = {
       type = "time-of-day"
-      restriction = {
-        end_hour   = 17
-        end_min    = 0
-        start_hour = 9
-        start_min  = 0
-      }
+      restrictions = [
+        {
+          end_hour   = 17
+          end_min    = 0
+          start_hour = 9
+          start_min  = 0
+        }
+      ]
     }
   }
 

examples/user/fixtures.tfvars

@@ -1,4 +1,3 @@
-enabled   = true
 namespace = "eg"
 stage     = "test"
 name      = "user"

examples/user/main.tf

@@ -6,7 +6,7 @@ module "user" {
   source = "../../modules/user"
 
   user = {
-    username  = "opsgenie-test@cloudposse.com"
+    username  = format("opsgenie-test+%s@cloudposse.com", var.random_string)
     full_name = "Opsgenie Test User"
     role      = "User"
     locale    = "en_US"

examples/user/variables.tf

@@ -3,3 +3,9 @@ variable "opsgenie_provider_api_key" {
   description = "The API Key for the Opsgenie Integration. If omitted, the OPSGENIE_API_KEY environment variable is used"
   default     = null
 }
+
+variable "random_string" {
+  type        = string
+  description = "A random string to append to the resource names"
+  default     = null
+}

modules/config/escalations.tf

@@ -8,7 +8,7 @@ resource "opsgenie_escalation" "this" {
   owner_team_id = try(opsgenie_team.this[each.value.owner_team_name].id, null)
 
   dynamic "rules" {
-    for_each = try(each.value.rules, [])
+    for_each = try([each.value.rules], [])
 
     content {
       condition   = try(rules.value.condition, "if-not-acked")

modules/notification_policy/main.tf

@@ -58,7 +58,7 @@ resource "opsgenie_notification_policy" "this" {
   }
 
   dynamic "auto_close_action" {
-    for_each = try(each.value.auto_close_action, null) != null ? [each.value.auto_close_action] : []
+    for_each = try(var.notification_policy.auto_close_action, null) != null ? [var.notification_policy.auto_close_action] : []
 
     content {
       duration {
@@ -70,7 +70,7 @@ resource "opsgenie_notification_policy" "this" {
   }
 
   dynamic "auto_restart_action" {
-    for_each = try(each.value.auto_restart_action, null) != null ? [each.value.auto_restart_action] : []
+    for_each = try(var.notification_policy.auto_restart_action, null) != null ? [var.notification_policy.auto_restart_action] : []
 
     content {
       duration {
@@ -120,5 +120,5 @@ resource "opsgenie_notification_policy" "this" {
     }
   }
 
-  suppress = try(each.value.suppress, null)
+  suppress = try(var.notification_policy.suppress, null)
 }