Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/require-pinned-github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/reusable-review_apps_on_pr_change.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion infra/deployments/deploy/engineer-access/roles.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion infra/deployments/forms/account/engineer-access.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/deployments/forms/health/monitoring/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions infra/deployments/forms/pipelines/apply-terraform.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/modules/auth0/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
2 changes: 1 addition & 1 deletion infra/modules/drift-detection/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion infra/modules/image-builder-pipeline/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion local/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
8 changes: 4 additions & 4 deletions support/pipeline-visualiser/views/deploying_changes.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This page has a summary about how to deploy changes to different repositories/ap
<p>

<p class="govuk-body">
For a more in depth explanation, you should read <a class="govuk-link" href="https://github.com/alphagov/forms-team/wiki/Deploying-to-production%3A-applications">Deploying to production: applications</a> and <a class="govuk-link" href="https://github.com/alphagov/forms-team/wiki/Deploying-to-production%3A-Terraform"> Deploying to production: Terraform</a> on the team wiki.
For a more in depth explanation, you should read <a class="govuk-link" href="https://github.com/govuk-forms/forms-team/wiki/Deploying-to-production%3A-applications">Deploying to production: applications</a> and <a class="govuk-link" href="https://github.com/govuk-forms/forms-team/wiki/Deploying-to-production%3A-Terraform"> Deploying to production: Terraform</a> on the team wiki.
</p>

<h2 class="govuk-heading-m">GOV.UK Forms applications</h2>
Expand All @@ -22,13 +22,13 @@ For a more in depth explanation, you should read <a class="govuk-link" href="htt

<p class="govuk-body">
To deploy a change to the infrastructure running these applications, see the
<a class="govuk-link" href="https://github.com/alphagov/forms-deploy">forms-deploy</a>
<a class="govuk-link" href="https://github.com/govuk-forms/forms-deploy">forms-deploy</a>
repository and <a class="govuk-link" href="#apply-terraform">Apply Terraform</a> pipelines.
</p>

<h2 class="govuk-heading-m">Pipeline visualiser (this tool)</h2>
<p class="govuk-body">
The pipeline visualiser tool lives <a class="govuk-link" href="https://github.com/alphagov/forms-deploy/tree/main/support/pipeline-visualiser">at <code>support/pipeline-visualiser/</code> in the forms-deploy repository</a>. It has a single pipeline that deploys changes to its one environment in the 'deploy' account.
The pipeline visualiser tool lives <a class="govuk-link" href="https://github.com/govuk-forms/forms-deploy/tree/main/support/pipeline-visualiser">at <code>support/pipeline-visualiser/</code> in the forms-deploy repository</a>. It has a single pipeline that deploys changes to its one environment in the 'deploy' account.
</p>

<p class="govuk-body">
Expand All @@ -37,7 +37,7 @@ For a more in depth explanation, you should read <a class="govuk-link" href="htt

<h2 id="apply-terraform" class="govuk-heading-m">Apply Terraform (infrastructure)</h2>
<p class="govuk-body">
<a class="govuk-link" href="https://github.com/alphagov/forms-deploy">forms-deploy</a> has an 'Apply Terraform' pipeline per environment. The pipelines exist in the account into which it deploys.
<a class="govuk-link" href="https://github.com/govuk-forms/forms-deploy">forms-deploy</a> has an 'Apply Terraform' pipeline per environment. The pipelines exist in the account into which it deploys.
</p>

<p class="govuk-body">
Expand Down
Loading