From b88dc8d3395cf279ea3a86b6b884bf114b1237eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 08:55:34 +0000 Subject: [PATCH 1/4] :dependabot: terraform(deps): Bump terraform-aws-modules/iam/aws from 5.44.1 to 5.44.2 in /terraform/aws/analytical-platform-data-engineering-sandbox-a/airflow-create-a-pipeline (#5517) --- .../airflow-create-a-pipeline/iam-policies.tf | 2 +- .../airflow-create-a-pipeline/iam-roles.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/aws/analytical-platform-data-engineering-sandbox-a/airflow-create-a-pipeline/iam-policies.tf b/terraform/aws/analytical-platform-data-engineering-sandbox-a/airflow-create-a-pipeline/iam-policies.tf index b465e1c83d..f6f02ac448 100644 --- a/terraform/aws/analytical-platform-data-engineering-sandbox-a/airflow-create-a-pipeline/iam-policies.tf +++ b/terraform/aws/analytical-platform-data-engineering-sandbox-a/airflow-create-a-pipeline/iam-policies.tf @@ -147,7 +147,7 @@ module "airflow_create_a_pipeline_iam_policy" { #checkov:skip=CKV_TF_1:Module is from Terraform registry source = "terraform-aws-modules/iam/aws//modules/iam-policy" - version = "5.44.1" + version = "5.44.2" name_prefix = "github-airflow-create-a-pipeline" diff --git a/terraform/aws/analytical-platform-data-engineering-sandbox-a/airflow-create-a-pipeline/iam-roles.tf b/terraform/aws/analytical-platform-data-engineering-sandbox-a/airflow-create-a-pipeline/iam-roles.tf index 9aa97846a9..0d76f2f078 100644 --- a/terraform/aws/analytical-platform-data-engineering-sandbox-a/airflow-create-a-pipeline/iam-roles.tf +++ b/terraform/aws/analytical-platform-data-engineering-sandbox-a/airflow-create-a-pipeline/iam-roles.tf @@ -2,7 +2,7 @@ module "airflow_create_a_pipeline_iam_role" { #checkov:skip=CKV_TF_1:Module is from Terraform registry source = "terraform-aws-modules/iam/aws//modules/iam-github-oidc-role" - version = "5.44.1" + version = "5.44.2" name = "github-airflow-create-a-pipeline" From 8f6a5c2cd3bc017ed8b184d087ea54cafb42f129 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 08:59:16 +0000 Subject: [PATCH 2/4] :dependabot: terraform(deps): Bump terraform-aws-modules/iam/aws from 5.44.1 to 5.44.2 in /terraform/aws/analytical-platform-production/route53 (#5524) --- .../aws/analytical-platform-production/route53/iam-polices.tf | 2 +- .../aws/analytical-platform-production/route53/iam-roles.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/aws/analytical-platform-production/route53/iam-polices.tf b/terraform/aws/analytical-platform-production/route53/iam-polices.tf index ea194f58c0..8ab9babc05 100644 --- a/terraform/aws/analytical-platform-production/route53/iam-polices.tf +++ b/terraform/aws/analytical-platform-production/route53/iam-polices.tf @@ -27,7 +27,7 @@ module "analytical_platform_compute_route53_access_iam_policy" { #checkov:skip=CKV_TF_2:Module registry does not support tags for versions source = "terraform-aws-modules/iam/aws//modules/iam-policy" - version = "5.44.1" + version = "5.44.2" name_prefix = "analytical-platform-compute-route53-access" diff --git a/terraform/aws/analytical-platform-production/route53/iam-roles.tf b/terraform/aws/analytical-platform-production/route53/iam-roles.tf index 4aa21a2981..65a9d612ee 100644 --- a/terraform/aws/analytical-platform-production/route53/iam-roles.tf +++ b/terraform/aws/analytical-platform-production/route53/iam-roles.tf @@ -3,7 +3,7 @@ module "analytical_platform_compute_route53_access_iam_role" { #checkov:skip=CKV_TF_2:Module registry does not support tags for versions source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role" - version = "5.44.1" + version = "5.44.2" create_role = true From ea357fcf72a3c70f21a6bb62fecbacc37ea97cb4 Mon Sep 17 00:00:00 2001 From: Jacob Woffenden Date: Wed, 2 Oct 2024 10:37:04 +0100 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=93=9D=20Amend=20references=20to=20`m?= =?UTF-8?q?inistryofjustice/data-platform`=20repository=20in=20the=20docs?= =?UTF-8?q?=20(#5526)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Correct references to data-platform --- .../joining-our-team/index.html.md.erb | 6 +++--- .../platform/infrastructure/terraform.html.md.erb | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/documentation/joining-our-team/index.html.md.erb b/source/documentation/joining-our-team/index.html.md.erb index 2dd4aae82c..560d9d6997 100644 --- a/source/documentation/joining-our-team/index.html.md.erb +++ b/source/documentation/joining-our-team/index.html.md.erb @@ -50,8 +50,8 @@ Our PagerDuty configuration is managed in Terraform. To add a user, do the following: -1. Add an entry into [`users.tf`](https://github.com/ministryofjustice/data-platform/blob/main/terraform/pagerduty/users.tf) +1. Add an entry into [`users.tf`](https://github.com/ministryofjustice/analytical-platform/blob/main/terraform/pagerduty/users.tf) -1. Add an entry into [`teams.tf`](https://github.com/ministryofjustice/data-platform/blob/main/terraform/pagerduty/teams.tf) +1. Add an entry into [`teams.tf`](https://github.com/ministryofjustice/analytical-platform/blob/main/terraform/pagerduty/teams.tf) -1. Add an entry into [`schedules.tf`](https://github.com/ministryofjustice/data-platform/blob/main/terraform/pagerduty/schedules.tf) +1. Add an entry into [`schedules.tf`](https://github.com/ministryofjustice/analytical-platform/blob/main/terraform/pagerduty/schedules.tf) diff --git a/source/documentation/platform/infrastructure/terraform.html.md.erb b/source/documentation/platform/infrastructure/terraform.html.md.erb index 756d8bc00c..bec13befbb 100644 --- a/source/documentation/platform/infrastructure/terraform.html.md.erb +++ b/source/documentation/platform/infrastructure/terraform.html.md.erb @@ -63,7 +63,7 @@ To create a new Terraform component, you will need to: | `ENVIRONMENT` | Name of the environment
| `development` | | `IS_PRODUCTION` | Whether the environment is production
| `false` | - `data.tf` [(Example)](https://github.com/ministryofjustice/data-platform/blob/main/terraform/aws/analytical-platform-data-production/airflow/data.tf) + `data.tf` [(Example)](https://github.com/ministryofjustice/analytical-platform/blob/main/terraform/aws/analytical-platform-data-production/airflow/data.tf)
@@ -83,7 +83,7 @@ To create a new Terraform component, you will need to:
- `terraform.tf` [(Example)](https://github.com/ministryofjustice/data-platform/blob/main/terraform/aws/analytical-platform-data-production/airflow/terraform.tf) + `terraform.tf` [(Example)](https://github.com/ministryofjustice/analytical-platform/blob/main/terraform/aws/analytical-platform-data-production/airflow/terraform.tf)
@@ -136,7 +136,7 @@ To create a new Terraform component, you will need to:
- `terraform.tfvars` [(Example)](https://github.com/ministryofjustice/data-platform/blob/main/terraform/aws/analytical-platform-data-production/airflow/terraform.tfvars) + `terraform.tfvars` [(Example)](https://github.com/ministryofjustice/analytical-platform/blob/main/terraform/aws/analytical-platform-data-production/airflow/terraform.tfvars)
@@ -156,13 +156,13 @@ To create a new Terraform component, you will need to: is-production = "${IS_PRODUCTION}" owner = "data-platform:data-platform-tech@digital.justice.gov.uk" infrastructure-support = "data-platform:data-platform-tech@digital.justice.gov.uk" - source-code = "github.com/ministryofjustice/data-platform/terraform/aws/${AWS_ACCOUNT_NAME}/${COMPONENT}" + source-code = "github.com/ministryofjustice/analytical-platform/terraform/aws/${AWS_ACCOUNT_NAME}/${COMPONENT}" } ```
- `variables.tf` [(Example)](https://github.com/ministryofjustice/data-platform/blob/main/terraform/aws/analytical-platform-data-production/airflow/variables.tf) + `variables.tf` [(Example)](https://github.com/ministryofjustice/analytical-platform/blob/main/terraform/aws/analytical-platform-data-production/airflow/variables.tf)
@@ -198,8 +198,8 @@ To create a new Terraform component, you will need to: ## Static Analysis -Static analysis was introduced in [#866](https://github.com/ministryofjustice/data-platform/pull/866), however the components that make up Analytical Platform -have not been remediated yet, this is addressed in [#886](https://github.com/ministryofjustice/data-platform/issues/886) +Static analysis was introduced in [#866](https://github.com/ministryofjustice/analytical-platform/pull/866), however the components that make up Analytical Platform +have not been remediated yet, this is addressed in [#886](https://github.com/ministryofjustice/analytical-platform/issues/886) If you are working on a component that has not yet been addressed, you will need to add the label `override-static-analysis` to your pull request From 320a442e8f1bb53d45ab1233cfbde3276e1050c0 Mon Sep 17 00:00:00 2001 From: Gary <26419401+Gary-H9@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:01:03 +0100 Subject: [PATCH 4/4] :pencil: Correct typo (#5527) * :pencil: Correct typo * Update link --- .../schedule-issue-cloud-development-environment-base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/schedule-issue-cloud-development-environment-base.yml b/.github/workflows/schedule-issue-cloud-development-environment-base.yml index 5a0b6dd27b..0fc9d4bdb1 100644 --- a/.github/workflows/schedule-issue-cloud-development-environment-base.yml +++ b/.github/workflows/schedule-issue-cloud-development-environment-base.yml @@ -38,7 +38,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_REPO: ${{ github.repository }} - TITLE: 📥 Maintenance - JupyterLab + TITLE: 📥 Maintenance - Analytical Platform Cloud Development Environment Base ASSIGNEES: LABELS: maintenance BODY: |