Skip to content

Commit 2ae989e

Browse files
lillie-daelillie-dae
authored
Merge branch 'main' into PRMP-1604
2 parents 16821fd + d9172a4 commit 2ae989e

76 files changed

Lines changed: 166 additions & 130 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/tf-plan-apply/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ inputs:
2222
terraform_version:
2323
description: "Terraform version to use"
2424
required: false
25-
default: "1.14.6"
25+
default: "1.14.7"
2626

2727
working_directory:
2828
description: "Terraform working directory"

‎.github/workflows/automated-deploy-dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- name: Setup Terraform
6161
uses: hashicorp/setup-terraform@v4
6262
with:
63-
terraform_version: 1.14.6
63+
terraform_version: 1.14.7
6464
terraform_wrapper: true
6565

6666
- name: Initialise Terraform
@@ -270,7 +270,7 @@ jobs:
270270
echo "SLACK_BOT_TOKEN=$slack_bot_token" >> $GITHUB_ENV
271271
272272
- name: Send Slack Notification
273-
uses: slackapi/slack-github-action@v2.1.1
273+
uses: slackapi/slack-github-action@v3.0.1
274274
with:
275275
method: chat.postMessage
276276
token: ${{ env.SLACK_BOT_TOKEN }}

‎.github/workflows/automated-sonarqube-cloud-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
echo "SLACK_BOT_TOKEN=$slack_bot_token" >> $GITHUB_ENV
5050
5151
- name: Send Slack Notification
52-
uses: slackapi/slack-github-action@v2.1.1
52+
uses: slackapi/slack-github-action@v3.0.1
5353
with:
5454
method: chat.postMessage
5555
token: ${{ env.SLACK_BOT_TOKEN }}

‎.github/workflows/base-cleanup-lambda-edge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
if: env.DISTRIBUTION_ID != ''
7070
run: |
7171
python3 -m venv ./venv
72-
./venv/bin/pip3 install --upgrade pip boto3==1.42.59
72+
./venv/bin/pip3 install --upgrade pip boto3==1.42.68
7373
7474
- name: Remove Lambda@Edge & CloudFront Associations
7575
if: env.DISTRIBUTION_ID != ''

‎.github/workflows/base-cleanup-workspace.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
run: |
4747
python3 -m venv ./venv
4848
./venv/bin/pip3 install --upgrade pip
49-
./venv/bin/pip3 install boto3==1.42.59
49+
./venv/bin/pip3 install boto3==1.42.68
5050
5151
- name: Configure AWS Credentials
5252
uses: aws-actions/configure-aws-credentials@v6

‎.github/workflows/cron-daily-health-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ jobs:
187187
echo "SLACK_BOT_TOKEN=$slack_bot_token" >> $GITHUB_ENV
188188
189189
- name: Send Slack Notification
190-
uses: slackapi/slack-github-action@v2.1.1
190+
uses: slackapi/slack-github-action@v3.0.1
191191
with:
192192
method: chat.postMessage
193193
token: ${{ env.SLACK_BOT_TOKEN }}

‎.github/workflows/cron-tear-down-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- name: Setup Terraform
5858
uses: hashicorp/setup-terraform@v4
5959
with:
60-
terraform_version: 1.14.6
60+
terraform_version: 1.14.7
6161
terraform_wrapper: false
6262

6363
- name: Initialise Terraform
@@ -114,14 +114,14 @@ jobs:
114114
ref: main
115115

116116
- name: Configure AWS Credentials
117-
uses: aws-actions/configure-aws-credentials@v5
117+
uses: aws-actions/configure-aws-credentials@v6
118118
with:
119119
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/test-github-bootstrap
120120
aws-region: ${{ vars.AWS_REGION }}
121121
mask-aws-account-id: true
122122

123123
- name: Setup Terraform
124-
uses: hashicorp/setup-terraform@v3
124+
uses: hashicorp/setup-terraform@v4
125125
with:
126126
terraform_version: 1.14.3
127127

‎.github/workflows/tear-down-sandbox.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
- name: Setup Terraform
8888
uses: hashicorp/setup-terraform@v4
8989
with:
90-
terraform_version: 1.14.6
90+
terraform_version: 1.14.7
9191

9292
- name: Initialise Terraform
9393
run: terraform init -backend-config=${{ vars.TF_BACKEND_FILE }}
@@ -124,7 +124,7 @@ jobs:
124124
- name: Setup Terraform
125125
uses: hashicorp/setup-terraform@v4
126126
with:
127-
terraform_version: 1.14.6
127+
terraform_version: 1.14.7
128128

129129
- name: Initialise Terraform
130130
run: terraform init -backend-config=bucket=ndr-dev-terraform-state-${{ secrets.AWS_ACCOUNT_ID }}

‎base_iam/iam_github_pre-prod.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ resource "aws_iam_role_policy" "github_extended_policy_virus_scanner_pre_prod" {
166166
"ssm:CreateDocument",
167167
"iam:TagRole",
168168
"SNS:TagResource",
169+
"SNS:SetSubscriptionAttributes",
169170
"cognito-idp:CreateUserPool",
170171
"cognito-idp:TagResource",
171172
"cognito-idp:SetUserPoolMfaConfig",

‎base_iam/iam_github_prod.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ resource "aws_iam_role_policy" "github_extended_policy_virus_scanner_prod" {
270270
"ssm:CreateDocument",
271271
"iam:TagRole",
272272
"SNS:TagResource",
273+
"SNS:SetSubscriptionAttributes",
273274
"cognito-idp:CreateUserPool",
274275
"cognito-idp:TagResource",
275276
"cognito-idp:SetUserPoolMfaConfig",

0 commit comments

Comments
 (0)