Merge branch 'main' into em/policy-update-2

ministryofjustice · Jun 12, 2024 · 9b12745 · 9b12745
2 parents 1d3396d + cf4b045
commit 9b12745
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 29 deletions.
diff --git a/.github/workflows/platform-pagerduty-rota-to-slack.yml b/.github/workflows/platform-pagerduty-rota-to-slack.yml
@@ -58,7 +58,7 @@ jobs:
 
       - name: Get AWS Secrets
         id: get_aws_secrets
-        uses: aws-actions/aws-secretsmanager-get-secrets@ff26a0aa6bd4dd5e51326b5afb3f5f6874c958c7 # v1.0.4
+        uses: aws-actions/aws-secretsmanager-get-secrets@98c2d6bf1dd67c2575fa2bb14294aa64103d426c # v1.0.4
         with:
           secret-ids: |
             PAGERDUTY_TOKEN, pagerduty-token

diff --git a/.github/workflows/repository-dependabot-configuration-generator.yml b/.github/workflows/repository-dependabot-configuration-generator.yml
@@ -38,7 +38,7 @@ jobs:
 
       - name: Commit Changes
         id: commit_changes
-        uses: planetscale/ghcommit-action@84c52a5164423e2cd66371ecae81d9049a2cf105 # v0.1.41
+        uses: planetscale/ghcommit-action@e1599c54d850c63ee45f5456a2ac741f49cfed01 # v0.1.42
         with:
           commit_message: "🤖 Update .github/dependabot.yml"
           file_pattern: ".github/dependabot.yml"

diff --git a/.github/workflows/reusable-workflow-terraform.yml b/.github/workflows/reusable-workflow-terraform.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Checkov
         if: github.ref != 'refs/heads/main'
         id: terraform_static_analysis_checkov
-        uses: bridgecrewio/checkov-action@0949c8b1a5009aa45413a4f02bc82971aa0d7bd2 # v12.2776.0
+        uses: bridgecrewio/checkov-action@d5cf7815e6ec033e990dc1d66c346983339a912b # v12.2777.0
         with:
           directory: ${{ env.working-directory }}
           framework: terraform
@@ -214,7 +214,7 @@ jobs:
       - name: Retrieve GitHub Robot Token
         if: github.ref != 'refs/heads/main'
         id: retrieve_github_robot_token
-        uses: aws-actions/aws-secretsmanager-get-secrets@ff26a0aa6bd4dd5e51326b5afb3f5f6874c958c7 # v1.0.4
+        uses: aws-actions/aws-secretsmanager-get-secrets@98c2d6bf1dd67c2575fa2bb14294aa64103d426c # v1.0.4
         with:
           secret-ids: |
             GITHUB_ROBOT_TOKEN, github-token

diff --git a/scripts/dependabot/list-open-dependabot-prs.sh b/scripts/dependabot/list-open-dependabot-prs.sh
@@ -16,6 +16,7 @@ REPOSITORIES=(
     "ministryofjustice/analytical-platform-actions-runner"
     "ministryofjustice/analytical-platform-rshiny-open-source-base"
     "ministryofjustice/analytical-platform-kubectl"
+    "ministryofjustice/analytical-platform-mlflow"
 )
 
 echo -e "🤖 Open Dependabots \n"

diff --git a/scripts/pagerduty/rota-to-slack/requirements.txt b/scripts/pagerduty/rota-to-slack/requirements.txt
@@ -1,2 +1,2 @@
 pdpyras==5.2.0
-slack-sdk==3.27.2
+slack-sdk==3.28.0
diff --git a/terraform/auth0/ministryofjustice-data-platform-development/.terraform.lock.hcl b/terraform/auth0/ministryofjustice-data-platform-development/.terraform.lock.hcl
diff --git a/terraform/auth0/ministryofjustice-data-platform-development/terraform.tf b/terraform/auth0/ministryofjustice-data-platform-development/terraform.tf
@@ -10,7 +10,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "5.52.0"
+      version = "5.53.0"
     }
     auth0 = {
       source  = "auth0/auth0"

diff --git a/terraform/aws/analytical-platform-data-production/ingestion-egress/kms-keys.tf b/terraform/aws/analytical-platform-data-production/ingestion-egress/kms-keys.tf
@@ -3,7 +3,7 @@ module "development_kms" {
   #checkov:skip=CKV_TF_2:Module registry does not support tags for versions
 
   source  = "terraform-aws-modules/kms/aws"
-  version = "3.0.0"
+  version = "3.1.0"
 
   aliases               = ["s3/mojap-data-production-bold-egress-development"]
   description           = "MoJ AP BOLD Egress - Development"
@@ -18,7 +18,7 @@ module "development_kms_eu_west_1_replica" {
   #checkov:skip=CKV_TF_2:Module registry does not support tags for versions
 
   source  = "terraform-aws-modules/kms/aws"
-  version = "3.0.0"
+  version = "3.1.0"
 
   providers = {
     aws = aws.eu-west-1
@@ -38,7 +38,7 @@ module "production_kms" {
   #checkov:skip=CKV_TF_2:Module registry does not support tags for versions
 
   source  = "terraform-aws-modules/kms/aws"
-  version = "3.0.0"
+  version = "3.1.0"
 
   aliases               = ["s3/mojap-data-production-bold-egress-production"]
   description           = "MoJ AP BOLD Egress - Production"
@@ -54,7 +54,7 @@ module "production_kms_eu_west_1_replica" {
   #checkov:skip=CKV_TF_2:Module registry does not support tags for versions
 
   source  = "terraform-aws-modules/kms/aws"
-  version = "3.0.0"
+  version = "3.1.0"
 
   providers = {
     aws = aws.eu-west-1

diff --git a/terraform/aws/analytical-platform-development/cluster/rds.tf b/terraform/aws/analytical-platform-development/cluster/rds.tf
@@ -6,7 +6,7 @@ module "rds" {
   #checkov:skip=CKV_TF_1:Module registry does not support commit hashes for versions
 
   source  = "terraform-aws-modules/rds/aws"
-  version = "6.6.0"
+  version = "6.7.0"
 
   identifier          = local.rds_identifier
   engine              = var.rds_engine

diff --git a/terraform/aws/analytical-platform-development/cluster/redis.tf b/terraform/aws/analytical-platform-development/cluster/redis.tf
@@ -6,7 +6,7 @@ module "control_panel_redis" {
   #checkov:skip=CKV_TF_1:Module registry does not support commit hashes for versions
 
   source  = "cloudposse/elasticache-redis/aws"
-  version = "1.2.3"
+  version = "1.3.0"
 
   enabled                    = var.redis_enabled
   replication_group_id       = local.redis_replication_group_id