Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesstottmoj committed Oct 2, 2024
2 parents da4f754 + 320a442 commit f75dd8a
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions source/documentation/joining-our-team/index.html.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ To create a new Terraform component, you will need to:
| `ENVIRONMENT` | Name of the environment<br /> | `development` |
| `IS_PRODUCTION` | Whether the environment is production<br /> | `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)

<details>

Expand All @@ -83,7 +83,7 @@ To create a new Terraform component, you will need to:

</details>

`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)

<details>

Expand Down Expand Up @@ -136,7 +136,7 @@ To create a new Terraform component, you will need to:

</details>

`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)

<details>

Expand All @@ -156,13 +156,13 @@ To create a new Terraform component, you will need to:
is-production = "${IS_PRODUCTION}"
owner = "data-platform:[email protected]"
infrastructure-support = "data-platform:[email protected]"
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}"
}
```

</details>

`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)

<details>

Expand Down Expand Up @@ -198,7 +198,7 @@ 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
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit f75dd8a

Please sign in to comment.