Merge pull request #8259 from ministryofjustice/revert/orchestration-…

…changes Revert/orchestration changes
ministryofjustice · Oct 15, 2024 · 4267c93 · 4267c93
2 parents 1cf1e4e + 90fb398
commit 4267c93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/terraform/pagerduty/aws.tf b/terraform/pagerduty/aws.tf
@@ -64,7 +64,7 @@ resource "aws_secretsmanager_secret_version" "pagerduty_integration_keys" {
  delius_mis_prod_alarms = pagerduty_service_integration.delius_mis_prod.integration_key
  laa_edw_nonprod_alarms = pagerduty_service_integration.edw_non_prod.integration_key
  laa_edw_prod_alarms = pagerduty_service_integration.edw_prod.integration_key
- cdpt-ifs-alarms = pagerduty_event_orchestration_integration.cdpt_ifs_cloudwatch_integration.parameters[0].routing_key
+ cdpt-ifs-alarms = pagerduty_service_integration.cdpt_ifs_cloudwatch.integration_key
  sprinkler_development = pagerduty_event_orchestration_integration.sprinkler_development_integration.parameters[0].routing_key
  corporate-staff-rostering-preproduction = pagerduty_service_integration.integrations["corporate-staff-rostering-preproduction"].integration_key
  corporate-staff-rostering-production = pagerduty_service_integration.integrations["corporate-staff-rostering-production"].integration_key

diff --git a/terraform/pagerduty/member-services-integrations.tf b/terraform/pagerduty/member-services-integrations.tf
@@ -1809,15 +1809,10 @@ resource "pagerduty_service" "cdpt-ifs" {
  alert_creation = "create_alerts_and_incidents"
 }
 
-resource "pagerduty_event_orchestration" "cdpt_ifs_cloudwatch" {
- name = "cdpt_ifs_cloudwatch orchestration"
- description = "Integrates with PagerDuty"
- team = pagerduty_team.modernisation_platform_members.id
-}
-
-resource "pagerduty_event_orchestration_integration" "cdpt_ifs_cloudwatch_integration" {
- event_orchestration = pagerduty_event_orchestration.cdpt_ifs_cloudwatch.id
- label = "CDPT IFS CloudWatch Integration"
+resource "pagerduty_service_integration" "cdpt_ifs_cloudwatch" {
+ name = data.pagerduty_vendor.cloudwatch.name
+ service = pagerduty_service.cdpt-ifs.id
+ vendor = data.pagerduty_vendor.cloudwatch.id
 }
 
 resource "pagerduty_slack_connection" "ifs_slack" {