Merge pull request #2030 from alphagov/mutliple-codestar-connections

cadmiumcat · web-flow · commit d3b0d57eddf7 · 2026-03-19T15:00:40.000Z
Mutliple codestar connections
diff --git a/infra/deployments/deploy/e2e-tests-image-builder/main.tf b/infra/deployments/deploy/e2e-tests-image-builder/main.tf
@@ -18,7 +18,7 @@ locals {
 
 module "forms_e2e_tests" {
   source                  = "../../../modules/e2e-image-pipeline"
-  codestar_connection_arn = var.codestar_connection_arn
+  codestar_connection_arn = var.codestar_connection_arn.alphagov
   ecr_repository_url      = data.terraform_remote_state.deploy_ecr.outputs.e2e_tests_ecr_repository_url
 }
 
diff --git a/infra/deployments/deploy/engineer-access/roles.tf b/infra/deployments/deploy/engineer-access/roles.tf
@@ -9,7 +9,7 @@ module "engineer_access" {
   readonly                  = module.users.with_role["deploy_readonly"]
   env_name                  = "deploy"
   environment_type          = "deploy"
-  codestar_connection_arn   = var.codestar_connection_arn
+  codestar_connection_arn   = var.codestar_connection_arn.alphagov
   allow_ecs_task_usage      = false
   allow_rds_data_api_access = false
   state_file_bucket_name    = "gds-forms-deploy-tfstate"
diff --git a/infra/deployments/deploy/image-builders/main.tf b/infra/deployments/deploy/image-builders/main.tf
@@ -3,7 +3,7 @@ module "build_product_page_container" {
   application_name        = "forms-product-page"
   container_repository    = "forms-product-page-deploy"
   source_repository       = "govuk-forms/forms-product-page"
-  codestar_connection_arn = var.codestar_connection_arn
+  codestar_connection_arn = var.codestar_connection_arn.govuk-forms
   ecr_repository_url      = data.terraform_remote_state.deploy_ecr.outputs.forms_product_page_ecr_repository_url
 
 }
@@ -13,7 +13,7 @@ module "build_forms_runner_container" {
   application_name        = "forms-runner"
   container_repository    = "forms-runner-deploy"
   source_repository       = "alphagov/forms-runner"
-  codestar_connection_arn = var.codestar_connection_arn
+  codestar_connection_arn = var.codestar_connection_arn.alphagov
   ecr_repository_url      = data.terraform_remote_state.deploy_ecr.outputs.forms_runner_ecr_repository_url
 }
 
@@ -23,6 +23,6 @@ module "build_forms_admin_container" {
   application_name        = "forms-admin"
   container_repository    = "forms-admin-deploy"
   source_repository       = "alphagov/forms-admin"
-  codestar_connection_arn = var.codestar_connection_arn
+  codestar_connection_arn = var.codestar_connection_arn.alphagov
   ecr_repository_url      = data.terraform_remote_state.deploy_ecr.outputs.forms_admin_ecr_repository_url
 }
diff --git a/infra/deployments/deploy/inputs.tf b/infra/deployments/deploy/inputs.tf
@@ -6,8 +6,14 @@ variable "deploy_account_id" {
 
 variable "codestar_connection_arn" {
   description = "the arn of the github connection to use"
-  type        = string
-  default     = "arn:aws:codestar-connections:eu-west-2:711966560482:connection/8ad08da2-743c-4431-bee6-ad1ae9efebe7"
+  type = object({
+    alphagov    = string
+    govuk-forms = string
+  })
+  default = {
+    alphagov    = "arn:aws:codestar-connections:eu-west-2:711966560482:connection/8ad08da2-743c-4431-bee6-ad1ae9efebe7"
+    govuk-forms = "arn:aws:codeconnections:eu-west-2:711966560482:connection/c285479e-88b3-430e-8c59-d96035a30f53"
+  }
 }
 
 variable "send_logs_to_cyber" {
diff --git a/infra/deployments/deploy/tools/pipeline-visualiser-pipeline.tf b/infra/deployments/deploy/tools/pipeline-visualiser-pipeline.tf
@@ -27,7 +27,7 @@ resource "aws_codepipeline" "deploy_pipeline_visualiser" {
       output_artifacts = ["forms_deploy"]
 
       configuration = {
-        ConnectionArn        = var.codestar_connection_arn
+        ConnectionArn        = var.codestar_connection_arn.alphagov
         FullRepositoryId     = "alphagov/forms-deploy"
         BranchName           = var.pipeline_source_branch
         DetectChanges        = true
@@ -109,7 +109,7 @@ module "pipeline_visualiser_docker_build" {
   docker_username_parameter_path = "/docker/username"
   docker_password_parameter_path = "/docker/password"
   artifact_store_arn             = module.pipeline_visualiser_artifact_bucket.arn
-  codestar_connection_arn        = var.codestar_connection_arn
+  codestar_connection_arn        = var.codestar_connection_arn.alphagov
   ecr_repository_url             = data.terraform_remote_state.deploy_ecr.outputs.pipeline_visualiser_ecr_repository_url
 }
 
@@ -174,12 +174,12 @@ data "aws_iam_policy_document" "pipeline_visualiser_deployer" {
       "codestar-connections:GetConnection",
       "codestar-connections:ListConnections"
     ]
-    resources = [var.codestar_connection_arn]
+    resources = [var.codestar_connection_arn.alphagov, var.codestar_connection_arn.govuk-forms]
     effect    = "Allow"
   }
   statement {
     actions   = ["codecommit:Get*", "codecommit:Describe*", "codecommit:GitPull"]
-    resources = [var.codestar_connection_arn]
+    resources = [var.codestar_connection_arn.alphagov, var.codestar_connection_arn.govuk-forms]
     effect    = "Allow"
   }
 
diff --git a/infra/deployments/forms/account/deployer-access.tf b/infra/deployments/forms/account/deployer-access.tf
@@ -6,7 +6,7 @@ module "deployer_access" {
   deploy_account_id        = var.deploy_account_id
   hosted_zone_id           = aws_route53_zone.public.id
   private_internal_zone_id = aws_route53_zone.private_internal.id
-  codestar_connection_arn  = var.codestar_connection_arn
+  codestar_connection_arn  = var.codestar_connection_arn.alphagov
   admin_engineer_role_arns = module.engineer_access.admin_role_arns
 
   depends_on = [aws_route53_zone.public, aws_route53_zone.private_internal]
diff --git a/infra/deployments/forms/account/engineer-access.tf b/infra/deployments/forms/account/engineer-access.tf
@@ -12,7 +12,7 @@ module "engineer_access" {
   pentesters                = var.pentester_email_addresses
   pentester_cidrs           = var.pentester_cidr_ranges
   vpn                       = var.require_vpn_to_access
-  codestar_connection_arn   = var.codestar_connection_arn
+  codestar_connection_arn   = var.codestar_connection_arn.alphagov
   allow_rds_data_api_access = true
   allow_ecs_task_usage      = true
   state_file_bucket_name    = var.bucket
diff --git a/infra/deployments/forms/account/inputs.tf b/infra/deployments/forms/account/inputs.tf
@@ -76,8 +76,11 @@ EOF
 
 variable "codestar_connection_arn" {
   description = "It isn't possible to automate the creation of a CodeStar connection, so we must create it by hand once in each account and hardcode its ARN."
-  type        = string
-  nullable    = false
+  type = object({
+    alphagov    = string
+    govuk-forms = string
+  })
+  nullable = false
 }
 
 variable "deploy_account_id" {
diff --git a/infra/deployments/forms/account/tfvars/dev.tfvars b/infra/deployments/forms/account/tfvars/dev.tfvars
@@ -1,11 +1,14 @@
-account_name              = "dev"
-aws_account_id            = "498160065950"
-environment_name          = "dev"
-environment_type          = "development"
-require_vpn_to_access     = false
-apex_domain               = "dev.forms.service.gov.uk"
-dns_delegation_records    = {}
-codestar_connection_arn   = "arn:aws:codestar-connections:eu-west-2:498160065950:connection/9dcd616c-3f7d-4f20-8a6b-8fca788e674b"
+account_name           = "dev"
+aws_account_id         = "498160065950"
+environment_name       = "dev"
+environment_type       = "development"
+require_vpn_to_access  = false
+apex_domain            = "dev.forms.service.gov.uk"
+dns_delegation_records = {}
+codestar_connection_arn = {
+  alphagov    = "arn:aws:codestar-connections:eu-west-2:498160065950:connection/9dcd616c-3f7d-4f20-8a6b-8fca788e674b"
+  govuk-forms = "arn:aws:codeconnections:eu-west-2:498160065950:connection/42243c20-40e2-467d-b135-999f91c37b55"
+}
 deploy_account_id         = "711966560482"
 pentester_email_addresses = []
 pentester_cidr_ranges     = []
diff --git a/infra/deployments/forms/account/tfvars/production.tfvars b/infra/deployments/forms/account/tfvars/production.tfvars
@@ -38,7 +38,10 @@ dns_delegation_records = {
     "ns-785.awsdns-34.net",
   ]
 }
-codestar_connection_arn   = "arn:aws:codestar-connections:eu-west-2:443944947292:connection/c253c931-651d-4d48-950a-c1ac2dfd7ca8"
+codestar_connection_arn = {
+  alphagov    = "arn:aws:codestar-connections:eu-west-2:443944947292:connection/c253c931-651d-4d48-950a-c1ac2dfd7ca8"
+  govuk-forms = "arn:aws:codeconnections:eu-west-2:443944947292:connection/a2c94a66-2c03-45db-bb18-5c37f8b44531"
+}
 deploy_account_id         = "711966560482"
 pentester_email_addresses = []
 pentester_cidr_ranges     = []
diff --git a/infra/deployments/forms/account/tfvars/staging.tfvars b/infra/deployments/forms/account/tfvars/staging.tfvars
@@ -1,11 +1,14 @@
-account_name              = "staging"
-aws_account_id            = "972536609845"
-environment_name          = "staging"
-environment_type          = "staging"
-require_vpn_to_access     = true
-apex_domain               = "staging.forms.service.gov.uk"
-dns_delegation_records    = {}
-codestar_connection_arn   = "arn:aws:codestar-connections:eu-west-2:972536609845:connection/de05d028-2cbd-4d06-8946-0e4aca60f4ca"
+account_name           = "staging"
+aws_account_id         = "972536609845"
+environment_name       = "staging"
+environment_type       = "staging"
+require_vpn_to_access  = true
+apex_domain            = "staging.forms.service.gov.uk"
+dns_delegation_records = {}
+codestar_connection_arn = {
+  alphagov    = "arn:aws:codestar-connections:eu-west-2:972536609845:connection/de05d028-2cbd-4d06-8946-0e4aca60f4ca"
+  govuk-forms = "arn:aws:codeconnections:eu-west-2:972536609845:connection/065d6101-9c43-4336-8fd4-777f3d6fc791"
+}
 deploy_account_id         = "711966560482"
 pentester_email_addresses = []
 pentester_cidr_ranges     = []
diff --git a/infra/deployments/forms/account/tfvars/user-research.tfvars b/infra/deployments/forms/account/tfvars/user-research.tfvars
@@ -1,11 +1,14 @@
-account_name              = "user-research"
-aws_account_id            = "619109835131"
-environment_name          = "user-research"
-environment_type          = "user_research"
-require_vpn_to_access     = false
-apex_domain               = "research.forms.service.gov.uk"
-dns_delegation_records    = {}
-codestar_connection_arn   = "arn:aws:codestar-connections:eu-west-2:619109835131:connection/6d5b8a26-b0d3-41da-ae2f-11a5f805bc3c"
+account_name           = "user-research"
+aws_account_id         = "619109835131"
+environment_name       = "user-research"
+environment_type       = "user_research"
+require_vpn_to_access  = false
+apex_domain            = "research.forms.service.gov.uk"
+dns_delegation_records = {}
+codestar_connection_arn = {
+  alphagov    = "arn:aws:codestar-connections:eu-west-2:619109835131:connection/6d5b8a26-b0d3-41da-ae2f-11a5f805bc3c"
+  govuk-forms = "arn:aws:codeconnections:eu-west-2:619109835131:connection/056111d5-bc23-48a9-a159-ce767093ed9b"
+}
 deploy_account_id         = "711966560482"
 pentester_email_addresses = []
 pentester_cidr_ranges     = []
diff --git a/infra/deployments/forms/inputs.tf b/infra/deployments/forms/inputs.tf
@@ -32,8 +32,11 @@ variable "account_name" {
 ##
 variable "codestar_connection_arn" {
   description = "It isn't possible to automate the creation of a CodeStar connection, so we must create it by hand once in each account and hardcode its ARN."
-  type        = string
-  nullable    = false
+  type = object({
+    alphagov    = string
+    govuk-forms = string
+  })
+  nullable = false
 }
 
 variable "container_registry" {
diff --git a/infra/deployments/forms/pipelines/apply-terraform.tf b/infra/deployments/forms/pipelines/apply-terraform.tf
@@ -81,7 +81,7 @@ resource "aws_codepipeline" "apply_terroform" {
       output_artifacts = ["forms_deploy"]
 
       configuration = {
-        ConnectionArn        = var.codestar_connection_arn
+        ConnectionArn        = var.codestar_connection_arn.alphagov
         FullRepositoryId     = "alphagov/forms-deploy"
         BranchName           = var.apply-terraform.pipeline_trigger == "GIT" ? var.apply-terraform.git_source_branch : "main"
         DetectChanges        = var.apply-terraform.pipeline_trigger == "GIT"
@@ -99,7 +99,7 @@ resource "aws_codepipeline" "apply_terroform" {
       output_artifacts = ["forms_e2e_tests"]
 
       configuration = {
-        ConnectionArn    = var.codestar_connection_arn
+        ConnectionArn    = var.codestar_connection_arn.alphagov
         FullRepositoryId = "alphagov/forms-e2e-tests"
         BranchName       = "main"
         # TODO: we should version this repository appropriately, so we can pick specific versions
@@ -300,7 +300,7 @@ module "run_end_to_end_tests" {
   artifact_store_arn      = module.artifact_bucket.arn
   service_role_arn        = data.aws_iam_role.deployer_role.arn
   deploy_account_id       = var.deploy_account_id
-  codestar_connection_arn = var.codestar_connection_arn
+  codestar_connection_arn = var.codestar_connection_arn.alphagov
   aws_s3_role_arn         = var.end_to_end_test_settings.aws_s3_role_arn
   aws_s3_bucket           = var.end_to_end_test_settings.aws_s3_bucket
   s3_form_id              = var.end_to_end_test_settings.s3_form_id
diff --git a/infra/deployments/forms/pipelines/deploy-forms-admin-container.tf b/infra/deployments/forms/pipelines/deploy-forms-admin-container.tf
@@ -132,7 +132,7 @@ resource "aws_codepipeline" "deploy_admin_container" {
       output_artifacts = ["forms_e2e_tests"]
 
       configuration = {
-        ConnectionArn    = var.codestar_connection_arn
+        ConnectionArn    = var.codestar_connection_arn.alphagov
         FullRepositoryId = "alphagov/forms-e2e-tests"
         BranchName       = "main"
         # TODO: we should version this repository appropriately, so we can pick specific versions
@@ -397,7 +397,7 @@ module "deploy_admin_end_to_end_tests" {
   artifact_store_arn      = module.artifact_bucket.arn
   service_role_arn        = data.aws_iam_role.deployer_role.arn
   deploy_account_id       = var.deploy_account_id
-  codestar_connection_arn = var.codestar_connection_arn
+  codestar_connection_arn = var.codestar_connection_arn.alphagov
   aws_s3_role_arn         = var.end_to_end_test_settings.aws_s3_role_arn
   aws_s3_bucket           = var.end_to_end_test_settings.aws_s3_bucket
   s3_form_id              = var.end_to_end_test_settings.s3_form_id
diff --git a/infra/deployments/forms/pipelines/deploy-forms-product-page-container.tf b/infra/deployments/forms/pipelines/deploy-forms-product-page-container.tf
@@ -132,7 +132,7 @@ resource "aws_codepipeline" "deploy_product_pages_container" {
       output_artifacts = ["forms_e2e_tests"]
 
       configuration = {
-        ConnectionArn    = var.codestar_connection_arn
+        ConnectionArn    = var.codestar_connection_arn.alphagov
         FullRepositoryId = "alphagov/forms-e2e-tests"
         BranchName       = "main"
         # TODO: we should version this repository appropriately, so we can pick specific versions
@@ -270,7 +270,7 @@ module "deploy_product_pages_end_to_end_tests" {
   artifact_store_arn      = module.artifact_bucket.arn
   service_role_arn        = data.aws_iam_role.deployer_role.arn
   deploy_account_id       = var.deploy_account_id
-  codestar_connection_arn = var.codestar_connection_arn
+  codestar_connection_arn = var.codestar_connection_arn.alphagov
   aws_s3_role_arn         = var.end_to_end_test_settings.aws_s3_role_arn
   aws_s3_bucket           = var.end_to_end_test_settings.aws_s3_bucket
   s3_form_id              = var.end_to_end_test_settings.s3_form_id
diff --git a/infra/deployments/forms/pipelines/deploy-forms-runner-container.tf b/infra/deployments/forms/pipelines/deploy-forms-runner-container.tf
@@ -132,7 +132,7 @@ resource "aws_codepipeline" "deploy_runner_container" {
       output_artifacts = ["forms_e2e_tests"]
 
       configuration = {
-        ConnectionArn    = var.codestar_connection_arn
+        ConnectionArn    = var.codestar_connection_arn.alphagov
         FullRepositoryId = "alphagov/forms-e2e-tests"
         BranchName       = "main"
         # TODO: we should version this repository appropriately, so we can pick specific versions
@@ -359,7 +359,7 @@ module "deploy_runner_end_to_end_tests" {
   artifact_store_arn      = module.artifact_bucket.arn
   service_role_arn        = data.aws_iam_role.deployer_role.arn
   deploy_account_id       = var.deploy_account_id
-  codestar_connection_arn = var.codestar_connection_arn
+  codestar_connection_arn = var.codestar_connection_arn.alphagov
   aws_s3_role_arn         = var.end_to_end_test_settings.aws_s3_role_arn
   aws_s3_bucket           = var.end_to_end_test_settings.aws_s3_bucket
   s3_form_id              = var.end_to_end_test_settings.s3_form_id
diff --git a/infra/deployments/forms/tfvars/dev.tfvars b/infra/deployments/forms/tfvars/dev.tfvars
@@ -63,10 +63,13 @@ additional_dns_records = [
     records = ["asvdns_6a94c72d-68ad-40b3-a79c-fd4451c6f4d7"]
   },
 ]
-codestar_connection_arn = "arn:aws:codestar-connections:eu-west-2:498160065950:connection/9dcd616c-3f7d-4f20-8a6b-8fca788e674b"
-container_registry      = "711966560482.dkr.ecr.eu-west-2.amazonaws.com"
-dlq_arn                 = "arn:aws:sqs:eu-west-2:711966560482:eventbridge-dead-letter-queue"
-send_logs_to_cyber      = true
+codestar_connection_arn = {
+  alphagov    = "arn:aws:codestar-connections:eu-west-2:498160065950:connection/9dcd616c-3f7d-4f20-8a6b-8fca788e674b"
+  govuk-forms = "arn:aws:codeconnections:eu-west-2:498160065950:connection/42243c20-40e2-467d-b135-999f91c37b55"
+}
+container_registry = "711966560482.dkr.ecr.eu-west-2.amazonaws.com"
+dlq_arn            = "arn:aws:sqs:eu-west-2:711966560482:eventbridge-dead-letter-queue"
+send_logs_to_cyber = true
 forms_admin_settings = {
   cpu                              = 256
   memory                           = 512
diff --git a/infra/deployments/forms/tfvars/production.tfvars b/infra/deployments/forms/tfvars/production.tfvars
@@ -119,10 +119,13 @@ additional_dns_records = [
     records = ["pk3kdktj7wwp.stspg-customer.com"]
   }
 ]
-codestar_connection_arn = "arn:aws:codestar-connections:eu-west-2:443944947292:connection/c253c931-651d-4d48-950a-c1ac2dfd7ca8"
-container_registry      = "711966560482.dkr.ecr.eu-west-2.amazonaws.com"
-dlq_arn                 = "arn:aws:sqs:eu-west-2:711966560482:eventbridge-dead-letter-queue"
-send_logs_to_cyber      = true
+codestar_connection_arn = {
+  alphagov    = "arn:aws:codestar-connections:eu-west-2:443944947292:connection/c253c931-651d-4d48-950a-c1ac2dfd7ca8"
+  govuk-forms = "arn:aws:codeconnections:eu-west-2:443944947292:connection/a2c94a66-2c03-45db-bb18-5c37f8b44531"
+}
+container_registry = "711966560482.dkr.ecr.eu-west-2.amazonaws.com"
+dlq_arn            = "arn:aws:sqs:eu-west-2:711966560482:eventbridge-dead-letter-queue"
+send_logs_to_cyber = true
 forms_admin_settings = {
   cpu                              = 512
   memory                           = 1024
diff --git a/infra/deployments/forms/tfvars/staging.tfvars b/infra/deployments/forms/tfvars/staging.tfvars
@@ -26,12 +26,15 @@ environmental_settings = {
   redis_multi_az_enabled              = false
   enable_advanced_database_insights   = true
 }
-root_domain             = "staging.forms.service.gov.uk"
-additional_dns_records  = []
-codestar_connection_arn = "arn:aws:codestar-connections:eu-west-2:972536609845:connection/de05d028-2cbd-4d06-8946-0e4aca60f4ca"
-container_registry      = "711966560482.dkr.ecr.eu-west-2.amazonaws.com"
-dlq_arn                 = "arn:aws:sqs:eu-west-2:711966560482:eventbridge-dead-letter-queue"
-send_logs_to_cyber      = true
+root_domain            = "staging.forms.service.gov.uk"
+additional_dns_records = []
+codestar_connection_arn = {
+  alphagov    = "arn:aws:codestar-connections:eu-west-2:972536609845:connection/de05d028-2cbd-4d06-8946-0e4aca60f4ca"
+  govuk-forms = "arn:aws:codeconnections:eu-west-2:972536609845:connection/065d6101-9c43-4336-8fd4-777f3d6fc791"
+}
+container_registry = "711966560482.dkr.ecr.eu-west-2.amazonaws.com"
+dlq_arn            = "arn:aws:sqs:eu-west-2:711966560482:eventbridge-dead-letter-queue"
+send_logs_to_cyber = true
 forms_admin_settings = {
   cpu                              = 256
   memory                           = 512
diff --git a/infra/deployments/forms/tfvars/user-research.tfvars b/infra/deployments/forms/tfvars/user-research.tfvars
@@ -24,12 +24,15 @@ environmental_settings = {
   redis_multi_az_enabled                   = false
   enable_advanced_database_insights        = false
 }
-root_domain             = "research.forms.service.gov.uk"
-additional_dns_records  = []
-codestar_connection_arn = "arn:aws:codestar-connections:eu-west-2:619109835131:connection/6d5b8a26-b0d3-41da-ae2f-11a5f805bc3c"
-container_registry      = "711966560482.dkr.ecr.eu-west-2.amazonaws.com"
-dlq_arn                 = "arn:aws:sqs:eu-west-2:711966560482:eventbridge-dead-letter-queue"
-send_logs_to_cyber      = true
+root_domain            = "research.forms.service.gov.uk"
+additional_dns_records = []
+codestar_connection_arn = {
+  alphagov    = "arn:aws:codestar-connections:eu-west-2:619109835131:connection/6d5b8a26-b0d3-41da-ae2f-11a5f805bc3c"
+  govuk-forms = "arn:aws:codeconnections:eu-west-2:619109835131:connection/056111d5-bc23-48a9-a159-ce767093ed9b"
+}
+container_registry = "711966560482.dkr.ecr.eu-west-2.amazonaws.com"
+dlq_arn            = "arn:aws:sqs:eu-west-2:711966560482:eventbridge-dead-letter-queue"
+send_logs_to_cyber = true
 forms_admin_settings = {
   cpu                              = 256
   memory                           = 512
diff --git a/infra/deployments/integration/inputs.tf b/infra/deployments/integration/inputs.tf
@@ -33,8 +33,10 @@ variable "require_vpn_to_access" {
 
 variable "codestar_connection_arn" {
   description = "It isn't possible to automate the creation of a CodeStar connection, so we must create it by hand once in each account and hardcode its ARN."
-  type        = string
-  nullable    = false
+  type = object({
+    alphagov    = string
+    govuk-forms = string
+  })
 }
 
 variable "deploy_account_id" {
diff --git a/infra/deployments/integration/review/gha-runner/inputs.tf b/infra/deployments/integration/review/gha-runner/inputs.tf
diff --git a/infra/deployments/integration/review/github_actions_runner.tf b/infra/deployments/integration/review/github_actions_runner.tf
diff --git a/infra/deployments/integration/tfvars/integration.tfvars b/infra/deployments/integration/tfvars/integration.tfvars

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ locals {`
`18`	`18`
`19`	`19`	`module "forms_e2e_tests" {`
`20`	`20`	`source = "../../../modules/e2e-image-pipeline"`
`21`		`- codestar_connection_arn = var.codestar_connection_arn`
	`21`	`+ codestar_connection_arn = var.codestar_connection_arn.alphagov`
`22`	`22`	`ecr_repository_url = data.terraform_remote_state.deploy_ecr.outputs.e2e_tests_ecr_repository_url`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,10 @@ dns_delegation_records = {`
`38`	`38`	`"ns-785.awsdns-34.net",`
`39`	`39`	`]`
`40`	`40`	`}`
`41`		`-codestar_connection_arn = "arn:aws:codestar-connections:eu-west-2:443944947292:connection/c253c931-651d-4d48-950a-c1ac2dfd7ca8"`
	`41`	`+codestar_connection_arn = {`
	`42`	`+ alphagov = "arn:aws:codestar-connections:eu-west-2:443944947292:connection/c253c931-651d-4d48-950a-c1ac2dfd7ca8"`
	`43`	`+ govuk-forms = "arn:aws:codeconnections:eu-west-2:443944947292:connection/a2c94a66-2c03-45db-bb18-5c37f8b44531"`
	`44`	`+}`
`42`	`45`	`deploy_account_id = "711966560482"`
`43`	`46`	`pentester_email_addresses = []`
`44`	`47`	`pentester_cidr_ranges = []`