From 14177ed99e924f471add36290ff8b5b98247d006 Mon Sep 17 00:00:00 2001 From: Catalina Garcia Date: Mon, 30 Mar 2026 14:07:50 +0100 Subject: [PATCH] Update repo references for forms-deploy We are migrating the forms-deploy repo from the alphagov github to govuk-forms --- .github/workflows/require-pinned-github-actions.yml | 2 +- .../workflows/reusable-review_apps_on_pr_change.yml | 2 +- README.md | 12 ++++++------ infra/deployments/deploy/engineer-access/roles.tf | 2 +- .../deploy/tools/pipeline-visualiser-pipeline.tf | 6 +++--- infra/deployments/forms/account/engineer-access.tf | 2 +- .../alerts/failed-submissions-job-executions.tf | 2 +- infra/deployments/forms/health/monitoring/main.tf | 2 +- infra/deployments/forms/pipelines/apply-terraform.tf | 6 +++--- .../forms/pipelines/deploy-forms-admin-container.tf | 2 +- .../pipelines/deploy-forms-product-page-container.tf | 2 +- .../forms/pipelines/deploy-forms-runner-container.tf | 2 +- infra/modules/auth0/README.md | 2 +- infra/modules/drift-detection/variables.tf | 2 +- infra/modules/image-builder-pipeline/variables.tf | 2 +- local/README.md | 2 +- .../pipeline-visualiser/views/deploying_changes.erb | 8 ++++---- 17 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/require-pinned-github-actions.yml b/.github/workflows/require-pinned-github-actions.yml index 93c792277..1dcfd55b4 100644 --- a/.github/workflows/require-pinned-github-actions.yml +++ b/.github/workflows/require-pinned-github-actions.yml @@ -16,4 +16,4 @@ jobs: - name: Ensure SHA pinned actions uses: zgosalvez/github-actions-ensure-sha-pinned-actions@6124774845927d14c601359ab8138699fa5b70c3 # v4.0.1 with: - allowlist: alphagov/forms-deploy + allowlist: govuk-forms/forms-deploy diff --git a/.github/workflows/reusable-review_apps_on_pr_change.yml b/.github/workflows/reusable-review_apps_on_pr_change.yml index 5603ba1d5..4460adb91 100644 --- a/.github/workflows/reusable-review_apps_on_pr_change.yml +++ b/.github/workflows/reusable-review_apps_on_pr_change.yml @@ -107,7 +107,7 @@ jobs: after 5 minutes, there may be something wrong with the ECS task. You will need to go to the integration AWS account to debug, or otherwise ask an infrastructure person. - For the sign in details and more information, [see the review apps wiki page](https://github.com/alphagov/forms-team/wiki/Review-apps). + For the sign in details and more information, [see the review apps wiki page](https://github.com/govuk-forms/forms-team/wiki/Review-apps). $COMMENT_MARKER EOF diff --git a/README.md b/README.md index 061de6233..2872dcac8 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ `forms-deploy` composes and deploys the different components of GOV.UK Forms to create a full environment. The major components of the repository are -- [Infrastructure](https://github.com/alphagov/forms-deploy/blob/main/infra/README.md) -- [Local development](https://github.com/alphagov/forms-deploy/blob/main/local/README.md) -- [Supporting scripts](https://github.com/alphagov/forms-deploy/tree/main/support) +- [Infrastructure](https://github.com/govuk-forms/forms-deploy/blob/main/infra/README.md) +- [Local development](https://github.com/govuk-forms/forms-deploy/blob/main/local/README.md) +- [Supporting scripts](https://github.com/govuk-forms/forms-deploy/tree/main/support) ## Table of contents @@ -93,17 +93,17 @@ This will find the latest version of Terraform and all of the Terraform provider ### Architecture decision records -https://github.com/alphagov/forms/tree/main/ADR +https://github.com/govuk-forms/forms/tree/main/ADR [^1]: This should not be confused with `forms-cli` at `support/forms-cli`. `forms-cli` is intended for working with a deployment of GOV.UK Forms, not deploying it. ### Path to production for apps -https://github.com/alphagov/forms-team/wiki/Deploying-to-production%3a-applications +https://github.com/govuk-forms/forms-team/wiki/Deploying-to-production%3a-applications ### Path to production for Terraform -https://github.com/alphagov/forms-team/wiki/Deploying-to-production%3a-Terraform +https://github.com/govuk-forms/forms-team/wiki/Deploying-to-production%3a-Terraform ### Pipeline Visualiser diff --git a/infra/deployments/deploy/engineer-access/roles.tf b/infra/deployments/deploy/engineer-access/roles.tf index 71656d1ed..78974a6d4 100644 --- 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.alphagov + codestar_connection_arn = var.codestar_connection_arn.govuk-forms 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/tools/pipeline-visualiser-pipeline.tf b/infra/deployments/deploy/tools/pipeline-visualiser-pipeline.tf index e4c116e3b..d8f294184 100644 --- a/infra/deployments/deploy/tools/pipeline-visualiser-pipeline.tf +++ b/infra/deployments/deploy/tools/pipeline-visualiser-pipeline.tf @@ -27,8 +27,8 @@ resource "aws_codepipeline" "deploy_pipeline_visualiser" { output_artifacts = ["forms_deploy"] configuration = { - ConnectionArn = var.codestar_connection_arn.alphagov - FullRepositoryId = "alphagov/forms-deploy" + ConnectionArn = var.codestar_connection_arn.govuk-forms + FullRepositoryId = "govuk-forms/forms-deploy" BranchName = var.pipeline_source_branch DetectChanges = true OutputArtifactFormat = "CODEBUILD_CLONE_REF" @@ -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.alphagov + codestar_connection_arn = var.codestar_connection_arn.govuk-forms ecr_repository_url = data.terraform_remote_state.deploy_ecr.outputs.pipeline_visualiser_ecr_repository_url } diff --git a/infra/deployments/forms/account/engineer-access.tf b/infra/deployments/forms/account/engineer-access.tf index 5e20127dd..05ddb4fa1 100644 --- 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.alphagov + codestar_connection_arn = var.codestar_connection_arn.govuk-forms allow_rds_data_api_access = true allow_ecs_task_usage = true state_file_bucket_name = var.bucket diff --git a/infra/deployments/forms/health/alerts/failed-submissions-job-executions.tf b/infra/deployments/forms/health/alerts/failed-submissions-job-executions.tf index 56b9efd99..e0d0a55af 100644 --- a/infra/deployments/forms/health/alerts/failed-submissions-job-executions.tf +++ b/infra/deployments/forms/health/alerts/failed-submissions-job-executions.tf @@ -4,7 +4,7 @@ resource "aws_cloudwatch_metric_alarm" "failed_submissions_job_executions" { There are one or more failed job executions for the submissions queue in forms-runner in the ${var.environment} environment that will not automatically be retried. -Follow the runbook to respond to this: https://github.com/alphagov/forms-team/wiki/Runbooks#handle-failed-solid-queue-jobs +Follow the runbook to respond to this: https://github.com/govuk-forms/forms-team/wiki/Runbooks#handle-failed-solid-queue-jobs Only close this Zendesk ticket when we get another Zendesk ticket to tell us that the alarm is in the OK state. EOF diff --git a/infra/deployments/forms/health/monitoring/main.tf b/infra/deployments/forms/health/monitoring/main.tf index 090beeee8..a0fb6f43d 100644 --- a/infra/deployments/forms/health/monitoring/main.tf +++ b/infra/deployments/forms/health/monitoring/main.tf @@ -40,7 +40,7 @@ module "runner_scheduled_smoke_tests" { intermittent issue so continue to next step regardless - Check the application logs for errors. - If this is not a false alarm, begin an incident and follow the incident response at - https://github.com/alphagov/forms-team/wiki/Incident-Response. + https://github.com/govuk-forms/forms-team/wiki/Incident-Response. EOF codebuild_environment_variables = { SMOKE_TEST_FORM_URL = var.scheduled_smoke_tests_settings.form_url diff --git a/infra/deployments/forms/pipelines/apply-terraform.tf b/infra/deployments/forms/pipelines/apply-terraform.tf index 234def6c9..c5544ab29 100644 --- a/infra/deployments/forms/pipelines/apply-terraform.tf +++ b/infra/deployments/forms/pipelines/apply-terraform.tf @@ -81,8 +81,8 @@ resource "aws_codepipeline" "apply_terroform" { output_artifacts = ["forms_deploy"] configuration = { - ConnectionArn = var.codestar_connection_arn.alphagov - FullRepositoryId = "alphagov/forms-deploy" + ConnectionArn = var.codestar_connection_arn.govuk-forms + FullRepositoryId = "govuk-forms/forms-deploy" BranchName = var.apply-terraform.pipeline_trigger == "GIT" ? var.apply-terraform.git_source_branch : "main" DetectChanges = var.apply-terraform.pipeline_trigger == "GIT" OutputArtifactFormat = "CODEBUILD_CLONE_REF" @@ -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.alphagov + codestar_connection_arn = var.codestar_connection_arn.govuk-forms 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 index d993bdb8a..d8cf10e4e 100644 --- a/infra/deployments/forms/pipelines/deploy-forms-admin-container.tf +++ b/infra/deployments/forms/pipelines/deploy-forms-admin-container.tf @@ -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.alphagov + codestar_connection_arn = var.codestar_connection_arn.govuk-forms 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 index 06b0f0e40..1dccfe593 100644 --- a/infra/deployments/forms/pipelines/deploy-forms-product-page-container.tf +++ b/infra/deployments/forms/pipelines/deploy-forms-product-page-container.tf @@ -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.alphagov + codestar_connection_arn = var.codestar_connection_arn.govuk-forms 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 index 5afc6e1bf..23737b031 100644 --- a/infra/deployments/forms/pipelines/deploy-forms-runner-container.tf +++ b/infra/deployments/forms/pipelines/deploy-forms-runner-container.tf @@ -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.alphagov + codestar_connection_arn = var.codestar_connection_arn.govuk-forms 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/modules/auth0/README.md b/infra/modules/auth0/README.md index b196e1af9..b67c51a4e 100644 --- a/infra/modules/auth0/README.md +++ b/infra/modules/auth0/README.md @@ -2,4 +2,4 @@ This module configures Auth0 tenants for authenticating users of the GOV.UK Forms admin app. -The module assumes you have already created an Auth0 tenancy. If you have not, you can [follow our wiki guide on creating Auth0 tenancies](https://github.com/alphagov/forms-team/wiki/Creating-Auth0-tenancies). +The module assumes you have already created an Auth0 tenancy. If you have not, you can [follow our wiki guide on creating Auth0 tenancies](https://github.com/govuk-forms/forms-team/wiki/Creating-Auth0-tenancies). diff --git a/infra/modules/drift-detection/variables.tf b/infra/modules/drift-detection/variables.tf index a789fe60d..34abeea51 100644 --- a/infra/modules/drift-detection/variables.tf +++ b/infra/modules/drift-detection/variables.tf @@ -11,7 +11,7 @@ variable "schedule_expression" { variable "git_repository_url" { description = "Git repository URL to clone" type = string - default = "https://github.com/alphagov/forms-deploy.git" + default = "https://github.com/govuk-forms/forms-deploy.git" } variable "git_branch" { diff --git a/infra/modules/image-builder-pipeline/variables.tf b/infra/modules/image-builder-pipeline/variables.tf index f36d8d2ad..1cd73192a 100644 --- a/infra/modules/image-builder-pipeline/variables.tf +++ b/infra/modules/image-builder-pipeline/variables.tf @@ -9,7 +9,7 @@ variable "container_repository" { variable "source_repository" { type = string - description = "Name of the source repository in GitHub from which to get the Dockerfile. E.g. alphagov/forms-deploy" + description = "Name of the source repository in GitHub from which to get the Dockerfile. E.g. govuk-forms/forms-deploy" validation { condition = can(regex("[A-Za-z0-9-_]+/[A-Za-z0-9-_]+", var.source_repository)) diff --git a/local/README.md b/local/README.md index 4364fa0a2..c80077539 100644 --- a/local/README.md +++ b/local/README.md @@ -3,7 +3,7 @@ This is a guide to getting the GOV.UK Forms development environment up and running. This repo lives at: -https://github.com/alphagov/forms-deploy +https://github.com/govuk-forms/forms-deploy The components which make up the service are: diff --git a/support/pipeline-visualiser/views/deploying_changes.erb b/support/pipeline-visualiser/views/deploying_changes.erb index afbf90362..44a1e38b8 100644 --- a/support/pipeline-visualiser/views/deploying_changes.erb +++ b/support/pipeline-visualiser/views/deploying_changes.erb @@ -4,7 +4,7 @@ This page has a summary about how to deploy changes to different repositories/ap

-For a more in depth explanation, you should read Deploying to production: applications and Deploying to production: Terraform on the team wiki. +For a more in depth explanation, you should read Deploying to production: applications and Deploying to production: Terraform on the team wiki.

GOV.UK Forms applications

@@ -22,13 +22,13 @@ For a more in depth explanation, you should read To deploy a change to the infrastructure running these applications, see the - forms-deploy + forms-deploy repository and Apply Terraform pipelines.

Pipeline visualiser (this tool)

- The pipeline visualiser tool lives at support/pipeline-visualiser/ in the forms-deploy repository. It has a single pipeline that deploys changes to its one environment in the 'deploy' account. + The pipeline visualiser tool lives at support/pipeline-visualiser/ in the forms-deploy repository. It has a single pipeline that deploys changes to its one environment in the 'deploy' account.

@@ -37,7 +37,7 @@ For a more in depth explanation, you should read Apply Terraform (infrastructure)

- forms-deploy has an 'Apply Terraform' pipeline per environment. The pipelines exist in the account into which it deploys. + forms-deploy has an 'Apply Terraform' pipeline per environment. The pipelines exist in the account into which it deploys.