From 384dcc9231d6155c285fb0c2c5c8dea93713023c Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 9 May 2024 18:38:20 +0300 Subject: [PATCH 01/21] Tag rustup artifacts with surrogate key We use surrogate keys[^1] on Fastly to invalidate the cache for specific objects, e.g. when new versions of Rust or rustup are released. Surrogate keys are transparently set in the Fastly configuration based on the request path. A new VCL snippet has been added that tags every rustup artifact with the `rustup` surrogate key so that we can purge them from the cache when a new rustup version is released. --- .../modules/release-distribution/fastly-static.tf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/terragrunt/modules/release-distribution/fastly-static.tf b/terragrunt/modules/release-distribution/fastly-static.tf index a98f8b34e..c5d4592b0 100644 --- a/terragrunt/modules/release-distribution/fastly-static.tf +++ b/terragrunt/modules/release-distribution/fastly-static.tf @@ -79,6 +79,21 @@ resource "fastly_service_vcl" "static" { VCL } + # When a new version of rustup is released, the release script invalidates + # the CloudFront cache for `/rustup/*` and any object that is tagged with + # the `rustup` key on Fastly. + # See https://github.com/rust-lang/rustup/blob/master/ci/sync-dist.py for + # details. + snippet { + name = "set cache key for rustup" + type = "fetch" + content = <<-VCL + if (req.url ~ "^\/rustup\/") { + set beresp.http.Surrogate-Key = "rustup"; + } + VCL + } + snippet { name = "redirect rustup.sh to rustup.rs" type = "error" From 600919c791229f4424a7be9cc0535736ff85904a Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 1 Aug 2024 10:12:22 +0200 Subject: [PATCH 02/21] chore: update github provider --- terraform/bors/_terraform.tf | 6 +++--- terraform/bors/app.tf | 2 ++ terraform/monitorbot/_terraform.tf | 2 +- terraform/rust-log-analyzer/_terraform.tf | 2 +- terraform/shared/modules/gha-iam-user/main.tf | 2 +- terraform/team-repo/_terraform.tf | 3 +-- terragrunt/modules/docs-rs/_terraform.tf | 2 +- terragrunt/modules/gha-iam-user/main.tf | 2 +- terragrunt/modules/sync-team/_terraform.tf | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/terraform/bors/_terraform.tf b/terraform/bors/_terraform.tf index 92a19642c..24a46889e 100644 --- a/terraform/bors/_terraform.tf +++ b/terraform/bors/_terraform.tf @@ -6,15 +6,15 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 3.59" + version = "~> 4.20" } github = { source = "integrations/github" - version = "~> 4.14" + version = "~> 6.2.3" } random = { source = "hashicorp/random" - version = "~> 3.0.0" + version = "~> 3.6.2" } } diff --git a/terraform/bors/app.tf b/terraform/bors/app.tf index e27ab6329..6d904e383 100644 --- a/terraform/bors/app.tf +++ b/terraform/bors/app.tf @@ -30,6 +30,8 @@ module "bors" { container_port = 80 domains = concat([var.domain_name], var.legacy_domain_names) + prometheus = null + health_check_path = "/health" health_check_interval = 60 health_check_timeout = 50 diff --git a/terraform/monitorbot/_terraform.tf b/terraform/monitorbot/_terraform.tf index 0b520a67d..6a4fda871 100644 --- a/terraform/monitorbot/_terraform.tf +++ b/terraform/monitorbot/_terraform.tf @@ -10,7 +10,7 @@ terraform { } github = { source = "integrations/github" - version = "~> 4.14" + version = "~> 6.2.3" } random = { source = "hashicorp/random" diff --git a/terraform/rust-log-analyzer/_terraform.tf b/terraform/rust-log-analyzer/_terraform.tf index ea3ec227e..aeeeee499 100644 --- a/terraform/rust-log-analyzer/_terraform.tf +++ b/terraform/rust-log-analyzer/_terraform.tf @@ -10,7 +10,7 @@ terraform { } github = { source = "integrations/github" - version = "~> 4.14" + version = "~> 6.2.3" } } diff --git a/terraform/shared/modules/gha-iam-user/main.tf b/terraform/shared/modules/gha-iam-user/main.tf index 901d5e0aa..df28d9519 100644 --- a/terraform/shared/modules/gha-iam-user/main.tf +++ b/terraform/shared/modules/gha-iam-user/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { github = { source = "integrations/github" - version = "~> 4.0" + version = "~> 6.2.3" } } } diff --git a/terraform/team-repo/_terraform.tf b/terraform/team-repo/_terraform.tf index c391fc0de..5ba6a545a 100644 --- a/terraform/team-repo/_terraform.tf +++ b/terraform/team-repo/_terraform.tf @@ -14,7 +14,7 @@ terraform { } github = { source = "integrations/github" - version = "~> 4.14" + version = "~> 6.2.3" } } @@ -42,4 +42,3 @@ data "terraform_remote_state" "shared" { region = "us-west-1" } } - diff --git a/terragrunt/modules/docs-rs/_terraform.tf b/terragrunt/modules/docs-rs/_terraform.tf index 162482c82..e74b682c2 100644 --- a/terragrunt/modules/docs-rs/_terraform.tf +++ b/terragrunt/modules/docs-rs/_terraform.tf @@ -12,7 +12,7 @@ terraform { } github = { source = "integrations/github" - version = "~> 4.0" + version = "~> 6.2.3" } } } diff --git a/terragrunt/modules/gha-iam-user/main.tf b/terragrunt/modules/gha-iam-user/main.tf index 901d5e0aa..df28d9519 100644 --- a/terragrunt/modules/gha-iam-user/main.tf +++ b/terragrunt/modules/gha-iam-user/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { github = { source = "integrations/github" - version = "~> 4.0" + version = "~> 6.2.3" } } } diff --git a/terragrunt/modules/sync-team/_terraform.tf b/terragrunt/modules/sync-team/_terraform.tf index 710a01518..2a432d8f9 100644 --- a/terragrunt/modules/sync-team/_terraform.tf +++ b/terragrunt/modules/sync-team/_terraform.tf @@ -14,7 +14,7 @@ terraform { } github = { source = "integrations/github" - version = "~> 4.14" + version = "~> 6.2.3" } } } From bcb6340dbe44a2472dcb056e53172ca9ab05229a Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 5 Aug 2024 10:35:14 +0200 Subject: [PATCH 03/21] chore: delete crates-io-downloads-archive state --- .../.terraform.lock.hcl | 25 ------------------- .../terragrunt.hcl | 12 --------- .../.terraform.lock.hcl | 25 ------------------- .../terragrunt.hcl | 12 --------- .../crates-io-downloads-archive/_terraform.tf | 10 -------- 5 files changed, 84 deletions(-) delete mode 100644 terragrunt/accounts/crates-io-prod/crates-io-downloads-archive/.terraform.lock.hcl delete mode 100644 terragrunt/accounts/crates-io-prod/crates-io-downloads-archive/terragrunt.hcl delete mode 100644 terragrunt/accounts/crates-io-staging/crates-io-downloads-archive/.terraform.lock.hcl delete mode 100644 terragrunt/accounts/crates-io-staging/crates-io-downloads-archive/terragrunt.hcl delete mode 100644 terragrunt/modules/crates-io-downloads-archive/_terraform.tf diff --git a/terragrunt/accounts/crates-io-prod/crates-io-downloads-archive/.terraform.lock.hcl b/terragrunt/accounts/crates-io-prod/crates-io-downloads-archive/.terraform.lock.hcl deleted file mode 100644 index a5470fdfc..000000000 --- a/terragrunt/accounts/crates-io-prod/crates-io-downloads-archive/.terraform.lock.hcl +++ /dev/null @@ -1,25 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" - hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", - ] -} diff --git a/terragrunt/accounts/crates-io-prod/crates-io-downloads-archive/terragrunt.hcl b/terragrunt/accounts/crates-io-prod/crates-io-downloads-archive/terragrunt.hcl deleted file mode 100644 index 561d48b23..000000000 --- a/terragrunt/accounts/crates-io-prod/crates-io-downloads-archive/terragrunt.hcl +++ /dev/null @@ -1,12 +0,0 @@ -terraform { - source = "../../../..//terragrunt/modules/crates-io-downloads-archive" -} - -include { - path = find_in_parent_folders() - merge_strategy = "deep" -} - -inputs = { - downloads_archive_bucket_name = "crates-io-downloads-archive" -} diff --git a/terragrunt/accounts/crates-io-staging/crates-io-downloads-archive/.terraform.lock.hcl b/terragrunt/accounts/crates-io-staging/crates-io-downloads-archive/.terraform.lock.hcl deleted file mode 100644 index a5470fdfc..000000000 --- a/terragrunt/accounts/crates-io-staging/crates-io-downloads-archive/.terraform.lock.hcl +++ /dev/null @@ -1,25 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" - hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", - ] -} diff --git a/terragrunt/accounts/crates-io-staging/crates-io-downloads-archive/terragrunt.hcl b/terragrunt/accounts/crates-io-staging/crates-io-downloads-archive/terragrunt.hcl deleted file mode 100644 index e4330cbce..000000000 --- a/terragrunt/accounts/crates-io-staging/crates-io-downloads-archive/terragrunt.hcl +++ /dev/null @@ -1,12 +0,0 @@ -terraform { - source = "../../../..//terragrunt/modules/crates-io-downloads-archive" -} - -include { - path = find_in_parent_folders() - merge_strategy = "deep" -} - -inputs = { - downloads_archive_bucket_name = "staging-crates-io-downloads-archive" -} diff --git a/terragrunt/modules/crates-io-downloads-archive/_terraform.tf b/terragrunt/modules/crates-io-downloads-archive/_terraform.tf deleted file mode 100644 index a4f0a52be..000000000 --- a/terragrunt/modules/crates-io-downloads-archive/_terraform.tf +++ /dev/null @@ -1,10 +0,0 @@ -terraform { - required_version = "~> 1" - - required_providers { - aws = { - source = "hashicorp/aws" - version = "~> 4.32" - } - } -} From 238a6d49d4dc9eaf0a501d6c8b13f1ced02372d1 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 5 Aug 2024 13:56:15 +0200 Subject: [PATCH 04/21] chore: add Marco Ieni to bastion allowed users --- terraform/bastion/firewall.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/bastion/firewall.tf b/terraform/bastion/firewall.tf index b564cbe06..5e4f5520e 100644 --- a/terraform/bastion/firewall.tf +++ b/terraform/bastion/firewall.tf @@ -20,6 +20,7 @@ locals { "rylev-ip-2", "jdn", "guillaumegomez", + "marcoieni", ] } From 2e1376ca62c208ec2bde1df170a0fae671fc5a0f Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:14:11 +0200 Subject: [PATCH 05/21] chore(docs-rs-staging): delete unused db --- terragrunt/modules/docs-rs/rds.tf | 152 +++++++++++------------ terragrunt/modules/docs-rs/web-server.tf | 6 +- 2 files changed, 79 insertions(+), 79 deletions(-) diff --git a/terragrunt/modules/docs-rs/rds.tf b/terragrunt/modules/docs-rs/rds.tf index dfa25e9d0..8efb9d66a 100644 --- a/terragrunt/modules/docs-rs/rds.tf +++ b/terragrunt/modules/docs-rs/rds.tf @@ -1,76 +1,76 @@ -resource "random_password" "db" { - length = 64 - special = false -} - -resource "aws_db_subnet_group" "db" { - name = "docs-rs-db" - subnet_ids = var.private_subnet_ids -} - -resource "aws_security_group" "db" { - vpc_id = var.cluster_config.vpc_id - name = "docs-rs-db" - description = "Access to the docs.rs database" - - ingress { - from_port = 5432 - to_port = 5432 - protocol = "tcp" - description = "Connections from the docs.rs web servers on ECS" - security_groups = [aws_security_group.web.id] - } - - ingress { - from_port = 5432 - to_port = 5432 - protocol = "tcp" - description = "Connections from the bastion" - security_groups = [var.bastion_security_group_id] - } -} - -resource "aws_db_instance" "db" { - identifier = "docs-rs" - - engine = "postgres" - engine_version = "14.3" - - instance_class = "db.t4g.small" - storage_type = "gp2" - db_subnet_group_name = aws_db_subnet_group.db.name - allocated_storage = 20 - max_allocated_storage = 100 - - publicly_accessible = false - vpc_security_group_ids = [aws_security_group.db.id] - - db_name = "docsrs" - username = "docsrs" - password = random_password.db.result - - backup_retention_period = 30 - backup_window = "05:00-06:00" # UTC - - deletion_protection = true - delete_automated_backups = false - - allow_major_version_upgrade = false - auto_minor_version_upgrade = true - maintenance_window = "Tue:15:00-Tue:16:00" # UTC - - enabled_cloudwatch_logs_exports = ["postgresql", "upgrade"] - performance_insights_enabled = true - - lifecycle { - ignore_changes = [ - engine_version, - ] - } -} - -resource "aws_ssm_parameter" "connection_url" { - name = "/docs-rs/database-url" - type = "SecureString" - value = "postgres://docsrs:${random_password.db.result}@${aws_db_instance.db.address}/docsrs" -} +# resource "random_password" "db" { +# length = 64 +# special = false +# } +# +# resource "aws_db_subnet_group" "db" { +# name = "docs-rs-db" +# subnet_ids = var.private_subnet_ids +# } +# +# resource "aws_security_group" "db" { +# vpc_id = var.cluster_config.vpc_id +# name = "docs-rs-db" +# description = "Access to the docs.rs database" +# +# ingress { +# from_port = 5432 +# to_port = 5432 +# protocol = "tcp" +# description = "Connections from the docs.rs web servers on ECS" +# security_groups = [aws_security_group.web.id] +# } +# +# ingress { +# from_port = 5432 +# to_port = 5432 +# protocol = "tcp" +# description = "Connections from the bastion" +# security_groups = [var.bastion_security_group_id] +# } +# } +# +# resource "aws_db_instance" "db" { +# identifier = "docs-rs" +# +# engine = "postgres" +# engine_version = "14.3" +# +# instance_class = "db.t4g.small" +# storage_type = "gp2" +# db_subnet_group_name = aws_db_subnet_group.db.name +# allocated_storage = 20 +# max_allocated_storage = 100 +# +# publicly_accessible = false +# vpc_security_group_ids = [aws_security_group.db.id] +# +# db_name = "docsrs" +# username = "docsrs" +# password = random_password.db.result +# +# backup_retention_period = 30 +# backup_window = "05:00-06:00" # UTC +# +# deletion_protection = true +# delete_automated_backups = false +# +# allow_major_version_upgrade = false +# auto_minor_version_upgrade = true +# maintenance_window = "Tue:15:00-Tue:16:00" # UTC +# +# enabled_cloudwatch_logs_exports = ["postgresql", "upgrade"] +# performance_insights_enabled = true +# +# lifecycle { +# ignore_changes = [ +# engine_version, +# ] +# } +# } +# +# resource "aws_ssm_parameter" "connection_url" { +# name = "/docs-rs/database-url" +# type = "SecureString" +# value = "postgres://docsrs:${random_password.db.result}@${aws_db_instance.db.address}/docsrs" +# } diff --git a/terragrunt/modules/docs-rs/web-server.tf b/terragrunt/modules/docs-rs/web-server.tf index 85c25890c..e98f34dd5 100644 --- a/terragrunt/modules/docs-rs/web-server.tf +++ b/terragrunt/modules/docs-rs/web-server.tf @@ -31,9 +31,9 @@ module "web" { DOCSRS_GITHUB_ACCESSTOKEN = "/docs-rs/github-access-token" } - computed_secrets = { - DOCSRS_DATABASE_URL = aws_ssm_parameter.connection_url.arn - } + # computed_secrets = { + # DOCSRS_DATABASE_URL = aws_ssm_parameter.connection_url.arn + # } expose_http = { container_port = 80 From 9352c467454a73ed22ee204844beb678eaa223f5 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:53:02 +0200 Subject: [PATCH 06/21] chore(legacy-account): delete unused docs-rs db --- terraform/docs-rs/rds.tf | 88 ++++++++++++++++----------------- terraform/docs-rs/web-server.tf | 6 +-- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/terraform/docs-rs/rds.tf b/terraform/docs-rs/rds.tf index 7c5c7bed7..7d1d738c3 100644 --- a/terraform/docs-rs/rds.tf +++ b/terraform/docs-rs/rds.tf @@ -48,47 +48,47 @@ resource "aws_security_group" "db" { } } -resource "aws_db_instance" "db" { - identifier = "docs-rs-prod" - - engine = "postgres" - engine_version = "14.7" - - instance_class = "db.t4g.small" - storage_type = "gp2" - db_subnet_group_name = aws_db_subnet_group.db.name - allocated_storage = 20 - max_allocated_storage = 100 - - publicly_accessible = false - vpc_security_group_ids = [aws_security_group.db.id] - - db_name = "docsrs" - username = "docsrs" - password = random_password.db.result - - backup_retention_period = 30 - backup_window = "05:00-06:00" # UTC - - deletion_protection = true - delete_automated_backups = false - - allow_major_version_upgrade = false - auto_minor_version_upgrade = true - maintenance_window = "Tue:15:00-Tue:16:00" # UTC - - enabled_cloudwatch_logs_exports = ["postgresql", "upgrade"] - performance_insights_enabled = true - - lifecycle { - ignore_changes = [ - engine_version, - ] - } -} - -resource "aws_ssm_parameter" "connection_url" { - name = "/prod/docs-rs/database-url" - type = "SecureString" - value = "postgres://docsrs:${random_password.db.result}@${aws_db_instance.db.address}/docsrs" -} +# resource "aws_db_instance" "db" { +# identifier = "docs-rs-prod" +# +# engine = "postgres" +# engine_version = "14.7" +# +# instance_class = "db.t4g.small" +# storage_type = "gp2" +# db_subnet_group_name = aws_db_subnet_group.db.name +# allocated_storage = 20 +# max_allocated_storage = 100 +# +# publicly_accessible = false +# vpc_security_group_ids = [aws_security_group.db.id] +# +# db_name = "docsrs" +# username = "docsrs" +# password = random_password.db.result +# +# backup_retention_period = 30 +# backup_window = "05:00-06:00" # UTC +# +# deletion_protection = true +# delete_automated_backups = false +# +# allow_major_version_upgrade = false +# auto_minor_version_upgrade = true +# maintenance_window = "Tue:15:00-Tue:16:00" # UTC +# +# enabled_cloudwatch_logs_exports = ["postgresql", "upgrade"] +# performance_insights_enabled = true +# +# lifecycle { +# ignore_changes = [ +# engine_version, +# ] +# } +# } +# +# resource "aws_ssm_parameter" "connection_url" { +# name = "/prod/docs-rs/database-url" +# type = "SecureString" +# value = "postgres://docsrs:${random_password.db.result}@${aws_db_instance.db.address}/docsrs" +# } diff --git a/terraform/docs-rs/web-server.tf b/terraform/docs-rs/web-server.tf index 1a9d9e272..5e5c7385f 100644 --- a/terraform/docs-rs/web-server.tf +++ b/terraform/docs-rs/web-server.tf @@ -29,9 +29,9 @@ module "web" { DOCSRS_GITHUB_ACCESSTOKEN = "/prod/docs-rs/github-access-token" } - computed_secrets = { - DOCSRS_DATABASE_URL = aws_ssm_parameter.connection_url.arn - } + # computed_secrets = { + # DOCSRS_DATABASE_URL = aws_ssm_parameter.connection_url.arn + # } expose_http = { container_port = 80 From dd585a32d4513e1d938a3904a860fee77fb2786a Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:58:46 +0200 Subject: [PATCH 07/21] update hashicorp/random to 3.6.2 --- terraform/docs-rs/.terraform.lock.hcl | 59 ++++++------ terraform/docs-rs/_terraform.tf | 2 +- terraform/monitorbot/.terraform.lock.hcl | 89 ++++++++++--------- terraform/monitorbot/_terraform.tf | 2 +- terraform/monitorbot/app.tf | 2 + terraform/rds-databases/.terraform.lock.hcl | 28 +++--- terraform/rds-databases/_terraform.tf | 2 +- .../bors-prod/app/.terraform.lock.hcl | 58 ++++++------ .../bors-staging/app/.terraform.lock.hcl | 58 ++++++------ .../docs-rs/.terraform.lock.hcl | 64 +++++++------ terragrunt/modules/docs-rs/_terraform.tf | 2 +- 11 files changed, 185 insertions(+), 181 deletions(-) diff --git a/terraform/docs-rs/.terraform.lock.hcl b/terraform/docs-rs/.terraform.lock.hcl index 47e8350d4..501211c86 100644 --- a/terraform/docs-rs/.terraform.lock.hcl +++ b/terraform/docs-rs/.terraform.lock.hcl @@ -2,44 +2,45 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.32.0" + version = "4.67.0" constraints = "~> 4.20, ~> 4.32" hashes = [ - "h1:7vBuXLVLAnkcLDxIb8QN6O5pD13KtFDTqcnF0hFnraM=", - "h1:8AKJChT1Sgqjfdn16BayH5DonF3B9g7qQ6N+IKPulP4=", - "zh:062c30cd8bcf29f8ee34c2b2509e4e8695c2bcac8b7a8145e1c72e83d4e68b13", - "zh:1503fabaace96a7eea4d73ced36a02a75ec587760850e58162e7eff419dcbb31", - "zh:39a1fa36f8cb999f048bf0000d9dab40b8b0c77df35584fb08aa8bd6c5052dee", - "zh:471a755d43b51cd7be3e386cebc151ad8d548c5dea798343620476887e721882", - "zh:61ed56fab811e62b8286e606d003f7eeb7e940ef99bb49c1d283d91c0b748cc7", - "zh:80607dfe5f7770d136d5c451308b9861084ffad08139de8014e48672ec43ea3f", - "zh:863bf0a6576f7a969a89631525250d947fbb207d3d13e7ca4f74d86bd97cdda3", - "zh:9a8f2e77e4f99dbb618eb8ad17218a4698833754b50d46da5727323a2050a400", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9b74ff6e638c2a470b3599d57c2081e0095976da0a54b6590884d571f930b53b", - "zh:da4fc553d50ae833d860ec95120e271c29b4cb636917ab5991327362b7486bb7", - "zh:f4b86e7df4e846a38774e8e648b41c5ebaddcefa913cfa1864568086b7735575", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.4.3" - constraints = "~> 3.3" + version = "3.6.2" + constraints = "~> 3.6.2" hashes = [ - "h1:saZR+mhthL0OZl4SyHXZraxyaBNVMxiZzks78nWcZ2o=", - "h1:xZGZf18JjMS06pFa4NErzANI98qi59SEcBsOcS2P2yQ=", - "zh:41c53ba47085d8261590990f8633c8906696fa0a3c4b384ff6a7ecbf84339752", - "zh:59d98081c4475f2ad77d881c4412c5129c56214892f490adf11c7e7a5a47de9b", - "zh:686ad1ee40b812b9e016317e7f34c0d63ef837e084dea4a1f578f64a6314ad53", + "h1:VavG5unYCa3SYISMKF9pzc3718M0bhPlcbUZZGl7wuo=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:84103eae7251384c0d995f5a257c72b0096605048f757b749b7b62107a5dccb3", - "zh:8ee974b110adb78c7cd18aae82b2729e5124d8f115d484215fd5199451053de5", - "zh:9dd4561e3c847e45de603f17fa0c01ae14cae8c4b7b4e6423c9ef3904b308dda", - "zh:bb07bb3c2c0296beba0beec629ebc6474c70732387477a65966483b5efabdbc6", - "zh:e891339e96c9e5a888727b45b2e1bb3fcbdfe0fd7c5b4396e4695459b38c8cb1", - "zh:ea4739860c24dfeaac6c100b2a2e357106a89d18751f7693f3c31ecf6a996f8d", - "zh:f0c76ac303fd0ab59146c39bc121c5d7d86f878e9a69294e29444d4c653786f8", - "zh:f143a9a5af42b38fed328a161279906759ff39ac428ebcfe55606e05e1518b93", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", ] } diff --git a/terraform/docs-rs/_terraform.tf b/terraform/docs-rs/_terraform.tf index 8d89daa3a..fa6d8dc3c 100644 --- a/terraform/docs-rs/_terraform.tf +++ b/terraform/docs-rs/_terraform.tf @@ -10,7 +10,7 @@ terraform { } random = { source = "hashicorp/random" - version = "~> 3.3" + version = "~> 3.6.2" } } diff --git a/terraform/monitorbot/.terraform.lock.hcl b/terraform/monitorbot/.terraform.lock.hcl index 1c994039c..61bd5df15 100644 --- a/terraform/monitorbot/.terraform.lock.hcl +++ b/terraform/monitorbot/.terraform.lock.hcl @@ -2,61 +2,66 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.20.1" + version = "4.67.0" constraints = "~> 4.20" hashes = [ - "h1:HHfwMYY0FDtMzaGgITqsPIBlUWnQNZ5+bTF1dyscsnw=", - "zh:21d064d8fac08376c633e002e2f36e83eb7958535e251831feaf38f51c49dafd", - "zh:3a37912ff43d89ce8d559ec86265d7506801bccb380c7cfb896e8ff24e3fe79d", - "zh:795eb175c85279ec51dbe12e4d1afa0860c2c0b22e5d36a8e8869f60a93b7931", - "zh:8afb61a18b17f8ff249cb23e9d3b5d2530944001ef1d56c1d53f41b0890c7ab8", - "zh:911701040395e0e4da4b7252279e7cf1593cdd26f22835e1a9eddbdb9691a1a7", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a46d54a6a5407f569f8178e916af888b2b268f86448c64cad165dc89759c8399", - "zh:c5f71fd5e3519a24fd6af455ef1c26a559cfdde7f626b0afbd2a73bb79f036b1", - "zh:df3b69d6c9b0cdc7e3f90ee08412b22332c32e97ad8ce6ccad528f89f235a7d3", - "zh:e99d6a64c03549d60c2accf792fa04466cfb317f72e895c8f67eff8a02920887", - "zh:eea7a0df8bcb69925c9ce8e15ef403c8bbf16d46c43e8f5607b116531d1bce4a", - "zh:f6a26ce77f7db1d50ce311e32902fd001fb365e5e45e47a9a5cd59d734c89cb6", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.0.1" - constraints = "~> 3.0.0" + version = "3.6.2" + constraints = "~> 3.6.2" hashes = [ - "h1:SzM8nt2wzLMI28A3CWAtW25g3ZCm1O4xD0h3Ps/rU1U=", - "zh:0d4f683868324af056a9eb2b06306feef7c202c88dbbe6a4ad7517146a22fb50", - "zh:4824b3c7914b77d41dfe90f6f333c7ac9860afb83e2a344d91fbe46e5dfbec26", - "zh:4b82e43712f3cf0d0cbc95b2cbcd409ba8f0dc7848fdfb7c13633c27468ed04a", - "zh:78b3a2b860c3ebc973a794000015f5946eb59b82705d701d487475406b2612f1", - "zh:88bc65197bd74ff408d147b32f0045372ae3a3f2a2fdd7f734f315d988c0e4a2", - "zh:91bd3c9f625f177f3a5d641a64e54d4b4540cb071070ecda060a8261fb6eb2ef", - "zh:a6818842b28d800f784e0c93284ff602b0c4022f407e4750da03f50b853a9a2c", - "zh:c4a1a2b52abd05687e6cfded4a789dcd7b43e7a746e4d02dd1055370cf9a994d", - "zh:cf65041bf12fc3bde709c1d267dbe94142bc05adcabc4feb17da3b12249132ac", - "zh:e385e00e7425dda9d30b74ab4ffa4636f4b8eb23918c0b763f0ffab84ece0c5c", + "h1:VavG5unYCa3SYISMKF9pzc3718M0bhPlcbUZZGl7wuo=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", ] } provider "registry.terraform.io/integrations/github" { - version = "4.26.1" + version = "4.31.0" constraints = "~> 4.0, ~> 4.14" hashes = [ - "h1:7in21iUvEJxqkMBojPKQcR8pIbL5I+adC+pMwYH3YDo=", - "zh:106aec70ccc00955282dbb07fc5daae9231db127bb6912c460ab7bbcc83e2497", - "zh:2b9c8ded414a7815ffe79774d428ea12c68ef1fb7b67aa95a9917c5f0e487738", - "zh:6494db79f68f1f220cffcfdf18ce1943c098a643eb610dc6cc8b27f0277069ad", - "zh:705a31d53d3417bdea1cb765fd84e9e958325de0ddd01b43a0c3175734d31098", - "zh:76389591b417d8035d7aa3b9f81883b87c8efa767fcd4968abfb30a2641df1cc", - "zh:7dcb526e515296080f724c3b2bdeb04739a46034ea382a0bd6210436d1904203", - "zh:9878bf61cca2439f32dc290245137b33cb9ca556e68e4bda36899f579e57b3f9", - "zh:9c1aabe76001fca0a16550720787b6635044846787152fb250304c369c415a8e", - "zh:bd22b65a74471589498298c5f3a5e4403b0d4be0812c257195eccc70df2dd561", - "zh:d9f36f76ce57c360bfd1d430712a4c7457fcd72aefc8914a49ba135cffd06615", - "zh:e7d2718706c904faaa935e8112fc1b4750109d070c49feaa2b4df03ebe866428", - "zh:f3eb43d54acd4c8dc0135a45621c74b58676295ac9c640ab9264f160ea0ba614", - "zh:f59490c68239bf1a3e3580be61378d605ed02b7023fb073da1ade7fa784dc674", - "zh:fdf6007b3180ccbdc9875c426f40d5ae7933f6a7b617aa2e0107226074946ea5", + "h1:FkBft5JlVtlcYcEM0CiphlFWgjBFQVziJMwrowuBIoc=", + "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", + "zh:0dca3802a7ea1ba4812c866bf202e62aef6c8995db8856fdb5b4d1d81b505518", + "zh:24e6a56b34b3e0dca6ca0d6f22d0a31dda6a3256713492902c39ce9edd14acbd", + "zh:42e41fa4e61218973615b7e5d564119bb5c728ee40b881539964cd704632d8c0", + "zh:6aa6bb04fdc00c3c762122e96ee7c19abfb8e42dc5d3a720b5767dbb4cfa274d", + "zh:74ea4bbad825eee831d37940760459786460fe492e1b30acb5c91c9edd14a5ea", + "zh:8e170f6d5e46c08fbc3b5ff251075382f75b53a66a83b7b005099fb99ad94f24", + "zh:9164b611e7318e3d08cc84513d3d8c27bd12336a7721a894cb3d346b60286233", + "zh:91d3397f021c5a9fedff36f84635ffc3169224494629bb4a578356a05091e182", + "zh:b061e1529499bf40f8f14c9c8116787dd50f6fd3d64ad38d77cd39db77e98ae9", + "zh:c9daff626f7a55c01db79b6ccc462948bf854d976c73def306ae9ae09e5afe1b", + "zh:ec7e223ae7d6292b8425b7190e801f1098a647d2aee3132761d37fd75cfcfe07", + "zh:f2001b2a2f7049fc74ffe54d7bc48c9dfec80956f468a2c8a550c5071d077dbd", + "zh:f75ec1e71924c50b346bced15883c626f697ffd3ee6c4bb2835e4170fe65215a", ] } diff --git a/terraform/monitorbot/_terraform.tf b/terraform/monitorbot/_terraform.tf index 0b520a67d..ad3202af6 100644 --- a/terraform/monitorbot/_terraform.tf +++ b/terraform/monitorbot/_terraform.tf @@ -14,7 +14,7 @@ terraform { } random = { source = "hashicorp/random" - version = "~> 3.0.0" + version = "~> 3.6.2" } } diff --git a/terraform/monitorbot/app.tf b/terraform/monitorbot/app.tf index ce8ab4de1..3766d4872 100644 --- a/terraform/monitorbot/app.tf +++ b/terraform/monitorbot/app.tf @@ -31,6 +31,8 @@ module "monitorbot" { container_port = 80 domains = ["monitorbot.infra.rust-lang.org"] + prometheus = null + health_check_path = "/" health_check_interval = 5 health_check_timeout = 2 diff --git a/terraform/rds-databases/.terraform.lock.hcl b/terraform/rds-databases/.terraform.lock.hcl index d9ea0ef90..5eb5c12aa 100644 --- a/terraform/rds-databases/.terraform.lock.hcl +++ b/terraform/rds-databases/.terraform.lock.hcl @@ -47,21 +47,21 @@ provider "registry.terraform.io/hashicorp/aws" { } provider "registry.terraform.io/hashicorp/random" { - version = "3.6.1" - constraints = "~> 3.6.1" + version = "3.6.2" + constraints = "~> 3.6.2" hashes = [ - "h1:a+Goawwh6Qtg4/bRWzfDtIdrEFfPlnVy0y4LdUQY3nI=", - "zh:2a0ec154e39911f19c8214acd6241e469157489fc56b6c739f45fbed5896a176", - "zh:57f4e553224a5e849c99131f5e5294be3a7adcabe2d867d8a4fef8d0976e0e52", - "zh:58f09948c608e601bd9d0a9e47dcb78e2b2c13b4bda4d8f097d09152ea9e91c5", - "zh:5c2a297146ed6fb3fe934c800e78380f700f49ff24dbb5fb5463134948e3a65f", + "h1:VavG5unYCa3SYISMKF9pzc3718M0bhPlcbUZZGl7wuo=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:7ce41e26f0603e31cdac849085fc99e5cd5b3b73414c6c6d955c0ceb249b593f", - "zh:8c9e8d30c4ef08ee8bcc4294dbf3c2115cd7d9049c6ba21422bd3471d92faf8a", - "zh:93e91be717a7ffbd6410120eb925ebb8658cc8f563de35a8b53804d33c51c8b0", - "zh:982542e921970d727ce10ed64795bf36c4dec77a5db0741d4665230d12250a0d", - "zh:b9d1873f14d6033e216510ef541c891f44d249464f13cc07d3f782d09c7d18de", - "zh:cfe27faa0bc9556391c8803ade135a5856c34a3fe85b9ae3bdd515013c0c87c1", - "zh:e4aabf3184bbb556b89e4b195eab1514c86a2914dd01c23ad9813ec17e863a8a", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", ] } diff --git a/terraform/rds-databases/_terraform.tf b/terraform/rds-databases/_terraform.tf index 66fef7930..3848bb1f3 100644 --- a/terraform/rds-databases/_terraform.tf +++ b/terraform/rds-databases/_terraform.tf @@ -14,7 +14,7 @@ terraform { } random = { source = "hashicorp/random" - version = "~> 3.6.1" + version = "~> 3.6.2" } } diff --git a/terragrunt/accounts/bors-prod/app/.terraform.lock.hcl b/terragrunt/accounts/bors-prod/app/.terraform.lock.hcl index a5f413320..1de87ff64 100644 --- a/terragrunt/accounts/bors-prod/app/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-prod/app/.terraform.lock.hcl @@ -2,42 +2,42 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.8.0" + version = "5.60.0" hashes = [ - "h1:vnjWfeuf4AflWsRq3ivVig8dR8PAg8BHTVyAtOzJ1yQ=", - "zh:0974311d5e1becfdcbdae43d022d52689fdad32a4145659e56ac534bcb8cba02", - "zh:100dc64a90fc0d36cf6e2882b4358fde17705edd8ab3c5f2c06d219c36b21565", - "zh:467a86de8a7d77cde5c3386f9e82d7f1bf5972d1b3d177e797d1d9d2e87fd357", - "zh:4ad1f8ef5c5522f81d271b93594a43a7666b3409ca201a1911cd950e489ef12b", - "zh:540a50ab7061c6df2057ec9580890a9e86a687233120af738985fa84dde2a20a", - "zh:6e7b73b770e92891da94751c3e0cff1e1b852f5121da8c4a689056833eeb7d94", - "zh:879d42721e86331b05ff77bd219ca9a062485cdb2fa803d2dcf63084f25d484c", - "zh:980563e615fbba127c02df6dc8872ce60f7137df45fdb8cd801cdcbae6cf192a", + "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", + "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", + "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", + "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", + "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", + "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", + "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", + "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", + "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a6ad25c4d3edde466ea68731097aedad4b68278af0742fc1ab71d2c30491f92e", - "zh:af8df9e06f576c11ce67ac2b675d0d8db4aac618fec95d27c10aa59436feebbf", - "zh:b625ca7c4b99c6b3af34041b9773ccd9d80b0dde264c40b5d163a6abd73793af", - "zh:c9e0ca6aa48ebaa0892ac438392c49052a86605f490950d5317855f35ab7d74a", - "zh:dc500a03d3ed6b1fed3f118a55a7fb93bf172965ae6b2f25cc7f4a152e44edd7", - "zh:e0438bf67d93a29f0d56f9a4544297155ca85c0f10626778d4c3aa68c7e93581", + "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", + "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", + "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", + "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", + "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", + "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.5.1" + version = "3.6.2" hashes = [ - "h1:IL9mSatmwov+e0+++YX2V6uel+dV6bn+fC/cnGDK3Ck=", - "zh:04e3fbd610cb52c1017d282531364b9c53ef72b6bc533acb2a90671957324a64", - "zh:119197103301ebaf7efb91df8f0b6e0dd31e6ff943d231af35ee1831c599188d", - "zh:4d2b219d09abf3b1bb4df93d399ed156cadd61f44ad3baf5cf2954df2fba0831", - "zh:6130bdde527587bbe2dcaa7150363e96dbc5250ea20154176d82bc69df5d4ce3", - "zh:6cc326cd4000f724d3086ee05587e7710f032f94fc9af35e96a386a1c6f2214f", + "h1:VavG5unYCa3SYISMKF9pzc3718M0bhPlcbUZZGl7wuo=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:b6d88e1d28cf2dfa24e9fdcc3efc77adcdc1c3c3b5c7ce503a423efbdd6de57b", - "zh:ba74c592622ecbcef9dc2a4d81ed321c4e44cddf7da799faa324da9bf52a22b2", - "zh:c7c5cde98fe4ef1143bd1b3ec5dc04baf0d4cc3ca2c5c7d40d17c0e9b2076865", - "zh:dac4bad52c940cd0dfc27893507c1e92393846b024c5a9db159a93c534a3da03", - "zh:de8febe2a2acd9ac454b844a4106ed295ae9520ef54dc8ed2faf29f12716b602", - "zh:eab0d0495e7e711cca367f7d4df6e322e6c562fc52151ec931176115b83ed014", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", ] } diff --git a/terragrunt/accounts/bors-staging/app/.terraform.lock.hcl b/terragrunt/accounts/bors-staging/app/.terraform.lock.hcl index a5f413320..1de87ff64 100644 --- a/terragrunt/accounts/bors-staging/app/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-staging/app/.terraform.lock.hcl @@ -2,42 +2,42 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.8.0" + version = "5.60.0" hashes = [ - "h1:vnjWfeuf4AflWsRq3ivVig8dR8PAg8BHTVyAtOzJ1yQ=", - "zh:0974311d5e1becfdcbdae43d022d52689fdad32a4145659e56ac534bcb8cba02", - "zh:100dc64a90fc0d36cf6e2882b4358fde17705edd8ab3c5f2c06d219c36b21565", - "zh:467a86de8a7d77cde5c3386f9e82d7f1bf5972d1b3d177e797d1d9d2e87fd357", - "zh:4ad1f8ef5c5522f81d271b93594a43a7666b3409ca201a1911cd950e489ef12b", - "zh:540a50ab7061c6df2057ec9580890a9e86a687233120af738985fa84dde2a20a", - "zh:6e7b73b770e92891da94751c3e0cff1e1b852f5121da8c4a689056833eeb7d94", - "zh:879d42721e86331b05ff77bd219ca9a062485cdb2fa803d2dcf63084f25d484c", - "zh:980563e615fbba127c02df6dc8872ce60f7137df45fdb8cd801cdcbae6cf192a", + "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", + "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", + "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", + "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", + "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", + "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", + "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", + "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", + "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a6ad25c4d3edde466ea68731097aedad4b68278af0742fc1ab71d2c30491f92e", - "zh:af8df9e06f576c11ce67ac2b675d0d8db4aac618fec95d27c10aa59436feebbf", - "zh:b625ca7c4b99c6b3af34041b9773ccd9d80b0dde264c40b5d163a6abd73793af", - "zh:c9e0ca6aa48ebaa0892ac438392c49052a86605f490950d5317855f35ab7d74a", - "zh:dc500a03d3ed6b1fed3f118a55a7fb93bf172965ae6b2f25cc7f4a152e44edd7", - "zh:e0438bf67d93a29f0d56f9a4544297155ca85c0f10626778d4c3aa68c7e93581", + "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", + "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", + "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", + "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", + "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", + "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.5.1" + version = "3.6.2" hashes = [ - "h1:IL9mSatmwov+e0+++YX2V6uel+dV6bn+fC/cnGDK3Ck=", - "zh:04e3fbd610cb52c1017d282531364b9c53ef72b6bc533acb2a90671957324a64", - "zh:119197103301ebaf7efb91df8f0b6e0dd31e6ff943d231af35ee1831c599188d", - "zh:4d2b219d09abf3b1bb4df93d399ed156cadd61f44ad3baf5cf2954df2fba0831", - "zh:6130bdde527587bbe2dcaa7150363e96dbc5250ea20154176d82bc69df5d4ce3", - "zh:6cc326cd4000f724d3086ee05587e7710f032f94fc9af35e96a386a1c6f2214f", + "h1:VavG5unYCa3SYISMKF9pzc3718M0bhPlcbUZZGl7wuo=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:b6d88e1d28cf2dfa24e9fdcc3efc77adcdc1c3c3b5c7ce503a423efbdd6de57b", - "zh:ba74c592622ecbcef9dc2a4d81ed321c4e44cddf7da799faa324da9bf52a22b2", - "zh:c7c5cde98fe4ef1143bd1b3ec5dc04baf0d4cc3ca2c5c7d40d17c0e9b2076865", - "zh:dac4bad52c940cd0dfc27893507c1e92393846b024c5a9db159a93c534a3da03", - "zh:de8febe2a2acd9ac454b844a4106ed295ae9520ef54dc8ed2faf29f12716b602", - "zh:eab0d0495e7e711cca367f7d4df6e322e6c562fc52151ec931176115b83ed014", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", ] } diff --git a/terragrunt/accounts/docs-rs-staging/docs-rs/.terraform.lock.hcl b/terragrunt/accounts/docs-rs-staging/docs-rs/.terraform.lock.hcl index 3071db7a8..a885930c8 100644 --- a/terragrunt/accounts/docs-rs-staging/docs-rs/.terraform.lock.hcl +++ b/terragrunt/accounts/docs-rs-staging/docs-rs/.terraform.lock.hcl @@ -2,49 +2,45 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.49.0" + version = "4.67.0" constraints = "~> 4.20, ~> 4.32" hashes = [ - "h1:1vbzsJ8TBjjotPQKWZQUrX2AII8+te1ih4bYJYD2VS4=", - "h1:oCosb3zFIsClMQiREtdiK4Av5TTzBAHtsYLd1Z5gff8=", - "h1:oOwWQpvQWd1uVP1axBz/TO6xzzLWoL982AY/MQfeF7I=", - "zh:09803937f00fdf2873eccf685eec7854408925cbf183c9b683df7c5825be463f", - "zh:2af1575e538fb0b669266f8d1385b17bfdaf17c521b6b6329baa1f2971fc4a4d", - "zh:3f71882b438cde3108fe68cfe2637839d3eed08157a9721bd97babf3912247a8", - "zh:577af1b38f5da8a9f29eebe5eebec9279d26e757cd03b0c8c59311f9ce8a859b", - "zh:60160d39094973beefb9b10cfd6aaa5b63a2e68c32445ecffcd1b101356e6f9b", - "zh:762656454722548baeccf35cbaa23b887976337e1ed321682df7390419fdf22d", - "zh:7f6d7887821659bf3bef815949077dc91ffcdb0d911644a887b6683b264a5ca6", - "zh:8f16a352cc903f8951fa4619c36233b3e66e27d724817b131f2035dd8896f524", - "zh:8f768f65e370366c8b91c00d01c9a6264fe26ea9ae1819f14bdcd12c066272bc", - "zh:95ad78c689a83c08ef7c3e544c3c9aca93ed528054aa77cc968ddd9efa3a1023", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a47097ab6a4ca8302da82964303ffdd2310ed65e8f8524bfe4058816cf1addb7", - "zh:b66d820c70cd5fd628ffe882d2b97e76b969dca4e6827ac2ba0f8d3bc5d6e9c6", - "zh:b80f713a4f3e1355c3dd1600e9d08b9f15ed2370054ec792ad2c01f2541abe02", - "zh:ce065bc3962cb71fa7652562226b9d486f3d7fcb88285c1020ebe2f550e28641", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.4.3" - constraints = "~> 3.4" + version = "3.6.2" + constraints = "~> 3.6.2" hashes = [ - "h1:saZR+mhthL0OZl4SyHXZraxyaBNVMxiZzks78nWcZ2o=", - "h1:tL3katm68lX+4lAncjQA9AXL4GR/VM+RPwqYf4D2X8Q=", - "h1:xZGZf18JjMS06pFa4NErzANI98qi59SEcBsOcS2P2yQ=", - "zh:41c53ba47085d8261590990f8633c8906696fa0a3c4b384ff6a7ecbf84339752", - "zh:59d98081c4475f2ad77d881c4412c5129c56214892f490adf11c7e7a5a47de9b", - "zh:686ad1ee40b812b9e016317e7f34c0d63ef837e084dea4a1f578f64a6314ad53", + "h1:VavG5unYCa3SYISMKF9pzc3718M0bhPlcbUZZGl7wuo=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:84103eae7251384c0d995f5a257c72b0096605048f757b749b7b62107a5dccb3", - "zh:8ee974b110adb78c7cd18aae82b2729e5124d8f115d484215fd5199451053de5", - "zh:9dd4561e3c847e45de603f17fa0c01ae14cae8c4b7b4e6423c9ef3904b308dda", - "zh:bb07bb3c2c0296beba0beec629ebc6474c70732387477a65966483b5efabdbc6", - "zh:e891339e96c9e5a888727b45b2e1bb3fcbdfe0fd7c5b4396e4695459b38c8cb1", - "zh:ea4739860c24dfeaac6c100b2a2e357106a89d18751f7693f3c31ecf6a996f8d", - "zh:f0c76ac303fd0ab59146c39bc121c5d7d86f878e9a69294e29444d4c653786f8", - "zh:f143a9a5af42b38fed328a161279906759ff39ac428ebcfe55606e05e1518b93", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", ] } diff --git a/terragrunt/modules/docs-rs/_terraform.tf b/terragrunt/modules/docs-rs/_terraform.tf index 162482c82..3f7aab9db 100644 --- a/terragrunt/modules/docs-rs/_terraform.tf +++ b/terragrunt/modules/docs-rs/_terraform.tf @@ -8,7 +8,7 @@ terraform { } random = { source = "hashicorp/random" - version = "~> 3.4" + version = "~> 3.6.2" } github = { source = "integrations/github" From b77e457a093c487a1100884dfe105184e0fbe7d1 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:49:09 +0200 Subject: [PATCH 08/21] remove bors --- terraform/bors/_terraform.tf | 6 +++--- terraform/bors/app.tf | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/terraform/bors/_terraform.tf b/terraform/bors/_terraform.tf index 24a46889e..92a19642c 100644 --- a/terraform/bors/_terraform.tf +++ b/terraform/bors/_terraform.tf @@ -6,15 +6,15 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 3.59" } github = { source = "integrations/github" - version = "~> 6.2.3" + version = "~> 4.14" } random = { source = "hashicorp/random" - version = "~> 3.6.2" + version = "~> 3.0.0" } } diff --git a/terraform/bors/app.tf b/terraform/bors/app.tf index 6d904e383..e27ab6329 100644 --- a/terraform/bors/app.tf +++ b/terraform/bors/app.tf @@ -30,8 +30,6 @@ module "bors" { container_port = 80 domains = concat([var.domain_name], var.legacy_domain_names) - prometheus = null - health_check_path = "/health" health_check_interval = 60 health_check_timeout = 50 From ef25430a2ebac30166471b7145bbcb32bdab19f1 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:10:56 +0200 Subject: [PATCH 09/21] wip --- terraform/monitorbot/.terraform.lock.hcl | 35 ++++---- .../rust-log-analyzer/.terraform.lock.hcl | 87 ++++++++----------- 2 files changed, 52 insertions(+), 70 deletions(-) diff --git a/terraform/monitorbot/.terraform.lock.hcl b/terraform/monitorbot/.terraform.lock.hcl index 61bd5df15..d94444ccc 100644 --- a/terraform/monitorbot/.terraform.lock.hcl +++ b/terraform/monitorbot/.terraform.lock.hcl @@ -45,23 +45,24 @@ provider "registry.terraform.io/hashicorp/random" { } provider "registry.terraform.io/integrations/github" { - version = "4.31.0" - constraints = "~> 4.0, ~> 4.14" + version = "6.2.3" + constraints = "~> 6.2.3" hashes = [ - "h1:FkBft5JlVtlcYcEM0CiphlFWgjBFQVziJMwrowuBIoc=", - "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", - "zh:0dca3802a7ea1ba4812c866bf202e62aef6c8995db8856fdb5b4d1d81b505518", - "zh:24e6a56b34b3e0dca6ca0d6f22d0a31dda6a3256713492902c39ce9edd14acbd", - "zh:42e41fa4e61218973615b7e5d564119bb5c728ee40b881539964cd704632d8c0", - "zh:6aa6bb04fdc00c3c762122e96ee7c19abfb8e42dc5d3a720b5767dbb4cfa274d", - "zh:74ea4bbad825eee831d37940760459786460fe492e1b30acb5c91c9edd14a5ea", - "zh:8e170f6d5e46c08fbc3b5ff251075382f75b53a66a83b7b005099fb99ad94f24", - "zh:9164b611e7318e3d08cc84513d3d8c27bd12336a7721a894cb3d346b60286233", - "zh:91d3397f021c5a9fedff36f84635ffc3169224494629bb4a578356a05091e182", - "zh:b061e1529499bf40f8f14c9c8116787dd50f6fd3d64ad38d77cd39db77e98ae9", - "zh:c9daff626f7a55c01db79b6ccc462948bf854d976c73def306ae9ae09e5afe1b", - "zh:ec7e223ae7d6292b8425b7190e801f1098a647d2aee3132761d37fd75cfcfe07", - "zh:f2001b2a2f7049fc74ffe54d7bc48c9dfec80956f468a2c8a550c5071d077dbd", - "zh:f75ec1e71924c50b346bced15883c626f697ffd3ee6c4bb2835e4170fe65215a", + "h1:qBH3fN/NItflQkBoIVdQa7n8WvBOuu7Ao20oeoAubKM=", + "zh:05874671652a260b12d784cc46b0eea156f493a5f12e00368d1f6cb319156257", + "zh:0c7a3cae5a66e5c5efc3b25ba646a0d46bfe1fd3edba1f5a75f51aede85a9d1b", + "zh:174310010d08f13e36e53ff18e44a21dd040c89884ef190a192c6ce27926a912", + "zh:23d1d8731e518354ce6a83419f49101aece63882b0ca7c489f3c598cc6ea5d5e", + "zh:4e88953816daf11ab1681c32c7988d4e29476fc44f0959fe03173532cf5044de", + "zh:6fab07734ccf27f5afee4442abae2d33245eabf35519032ce1e2aad6961a640a", + "zh:7b2f324b918e161c892c29ee80d36c48ca8b891b8047e132fc701ca741e5ae72", + "zh:8ef4f0d691ade98082ef1f6b36e556468e5ab26e60021f0de0fb22e3acdfd990", + "zh:8f0f3e139faa8f2b9075bb9978dd683f4bab5ac91171bbb969addd04d7f0b90f", + "zh:97cb6d7fdf640237cc2f0ab830db8f878770968c59fd28298e9dddb8b9e6294d", + "zh:a17038d8747c6bb660e4c5981e8ffbbc33c66ba164868fd35d442e7f828a1e01", + "zh:aa9f4b7d947f7b11277b4e9ba7147f5594cf60a6589b7aac4344f73d1400d1c0", + "zh:c780b951e14d583ef6ffef9a934831b56ee157c50ed8e969c676a636810f7db1", + "zh:d8497bb2986fd76107b7208b33cc39281797164fdea09453e987b969a461befb", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } diff --git a/terraform/rust-log-analyzer/.terraform.lock.hcl b/terraform/rust-log-analyzer/.terraform.lock.hcl index df2fa5443..05bfd5ec0 100644 --- a/terraform/rust-log-analyzer/.terraform.lock.hcl +++ b/terraform/rust-log-analyzer/.terraform.lock.hcl @@ -2,66 +2,47 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.58.0" + version = "4.67.0" constraints = "~> 4.20" hashes = [ - "h1:xXjZy36R+YOFyLjuF+rgi0NDLwnkFwrJ2t9NfsjRM/E=", - "zh:14b2b2dfbc7ee705c412d762b1485ee08958c816a64ac74f5769e946e4a1d265", - "zh:17a37e6825e2023b18987d31c0cbb9336654ea146b68e6c90710ea4636af71ae", - "zh:273127c69fb244577e5c136c46164d34f77b0c956c18d27f63d1072dd558f924", - "zh:4b2b6416d34fb3e1051c99d2a84045b136976140e34381d5fbf90e32db15272e", - "zh:7e6a8571ff15d51f892776265642ee01004b8553fd4f6f2014b6f3f2834670c7", - "zh:847c76ab2381b66666d0f79cf1ac697b5bfd0d9c3009fd11bc6ad6545d1eb427", - "zh:9a52cae08ba8d27d0639a8d2b8c61591027883058bf0cc5a639cffe1e299f019", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9df647e8322d6f94f1843366ba39d21c4b36c8e7dcdc03711d52e27f73b0e974", - "zh:9e52037e68409802ff913b166c30e3f2035af03865cbef0c1b03762bce853941", - "zh:a30288e7c3c904d6998d1709835d7c5800a739f8608f0837f960286a2b8b6e59", - "zh:a7f24e3bda3be566468e4ad62cef1016f68c6f5a94d2e3e979485bc05626281b", - "zh:ba326ba80f5e39829b67a6d1ce54ba52b171e5e13a0a91ef5f9170a9b0cc9ce4", - "zh:c4e3fe9f2be6e244a3dfce599f4b0be9e8fffaece64cbc65f3195f825f65489b", - "zh:f20a251af37039bb2c7612dbd2c5df3a25886b4cc78f902385a2850ea6e30d08", - ] -} - -provider "registry.terraform.io/hashicorp/github" { - version = "4.14.0" - hashes = [ - "h1:GIBd5BCbId37l9knEcP9k4NwOVrfJMToKkuSZ5kUEX0=", - "zh:1c675ce700c0ebfc7ef437443fb25f912a62717b7bca60071bf9733d23db9576", - "zh:242362cc1b4932b80333f3f9b4dab6edfc84fd4cb9811bad81872939cf088b5a", - "zh:25bc76d0e8cce0b8bcee45a88810d655e1253c9001533b087f57fd223dc4881c", - "zh:3bce5f98e087796866ade17cfaa8b3f70018b53e8cff3cae32dac0a910d060a8", - "zh:3dda969761bb60c1721dac6901450be08b2d7501eda21146ba9dc172fcc05723", - "zh:5bf6b85ce208a113b54d70b973f81e7c7a7ea9a3f6d2b30eaa41ea641333ab25", - "zh:81b75b38332affb15bc9004c8c6aa746595b0879f779c4886899aef3db434645", - "zh:8a2310d85ecd60c079ec2db14ed338296f83b77857ae68e48b1a7a8a946a260c", - "zh:a9f1d55cee031c883ead6420896225806fda239374d730ed2d7446bee3224564", - "zh:caa1cf690c4e208847b026071567a7ee8b2e55dbc75649e7de393b5502a2418b", - "zh:e4a077b84a01d3c50ab0de1eb70122912c340f89be995177fb4ab0635f11527e", - "zh:e9e40b34915e1cfae711218976f398e3dae5c96682516dab870fc97e8048f416", - "zh:fadf11408f16ddf1605419a357ac53cf2dde6cc769757eacc9ae804a21c8d71e", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } provider "registry.terraform.io/integrations/github" { - version = "4.31.0" - constraints = "~> 4.0, ~> 4.14" + version = "6.2.3" + constraints = "~> 6.2.3" hashes = [ - "h1:nO3MyFnQToKUSIImFS2ib7RAMOy02Me6Up4qGBvdKMw=", - "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", - "zh:0dca3802a7ea1ba4812c866bf202e62aef6c8995db8856fdb5b4d1d81b505518", - "zh:24e6a56b34b3e0dca6ca0d6f22d0a31dda6a3256713492902c39ce9edd14acbd", - "zh:42e41fa4e61218973615b7e5d564119bb5c728ee40b881539964cd704632d8c0", - "zh:6aa6bb04fdc00c3c762122e96ee7c19abfb8e42dc5d3a720b5767dbb4cfa274d", - "zh:74ea4bbad825eee831d37940760459786460fe492e1b30acb5c91c9edd14a5ea", - "zh:8e170f6d5e46c08fbc3b5ff251075382f75b53a66a83b7b005099fb99ad94f24", - "zh:9164b611e7318e3d08cc84513d3d8c27bd12336a7721a894cb3d346b60286233", - "zh:91d3397f021c5a9fedff36f84635ffc3169224494629bb4a578356a05091e182", - "zh:b061e1529499bf40f8f14c9c8116787dd50f6fd3d64ad38d77cd39db77e98ae9", - "zh:c9daff626f7a55c01db79b6ccc462948bf854d976c73def306ae9ae09e5afe1b", - "zh:ec7e223ae7d6292b8425b7190e801f1098a647d2aee3132761d37fd75cfcfe07", - "zh:f2001b2a2f7049fc74ffe54d7bc48c9dfec80956f468a2c8a550c5071d077dbd", - "zh:f75ec1e71924c50b346bced15883c626f697ffd3ee6c4bb2835e4170fe65215a", + "h1:qBH3fN/NItflQkBoIVdQa7n8WvBOuu7Ao20oeoAubKM=", + "zh:05874671652a260b12d784cc46b0eea156f493a5f12e00368d1f6cb319156257", + "zh:0c7a3cae5a66e5c5efc3b25ba646a0d46bfe1fd3edba1f5a75f51aede85a9d1b", + "zh:174310010d08f13e36e53ff18e44a21dd040c89884ef190a192c6ce27926a912", + "zh:23d1d8731e518354ce6a83419f49101aece63882b0ca7c489f3c598cc6ea5d5e", + "zh:4e88953816daf11ab1681c32c7988d4e29476fc44f0959fe03173532cf5044de", + "zh:6fab07734ccf27f5afee4442abae2d33245eabf35519032ce1e2aad6961a640a", + "zh:7b2f324b918e161c892c29ee80d36c48ca8b891b8047e132fc701ca741e5ae72", + "zh:8ef4f0d691ade98082ef1f6b36e556468e5ab26e60021f0de0fb22e3acdfd990", + "zh:8f0f3e139faa8f2b9075bb9978dd683f4bab5ac91171bbb969addd04d7f0b90f", + "zh:97cb6d7fdf640237cc2f0ab830db8f878770968c59fd28298e9dddb8b9e6294d", + "zh:a17038d8747c6bb660e4c5981e8ffbbc33c66ba164868fd35d442e7f828a1e01", + "zh:aa9f4b7d947f7b11277b4e9ba7147f5594cf60a6589b7aac4344f73d1400d1c0", + "zh:c780b951e14d583ef6ffef9a934831b56ee157c50ed8e969c676a636810f7db1", + "zh:d8497bb2986fd76107b7208b33cc39281797164fdea09453e987b969a461befb", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } From 43304c997b01b515506dd04c040a1a9aa7e3d184 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 13 Aug 2024 14:33:24 +0200 Subject: [PATCH 10/21] Create CloudFront distribution for Rustup builds Rustup builds are automatically uploaded to S3 from the CI in rust-lang/rustup[^1]. The bucket is not publicly accessible, but we still want to make the build artifacts available to users for pre-release testing or debugging. For this purpose, a new CloudFront distribution has been created. [^1]: https://github.com/rust-lang/rustup --- .../legacy/rustup-prod/rustup/terragrunt.hcl | 4 ++ terragrunt/modules/rustup/certificate.tf | 13 +++++ terragrunt/modules/rustup/cloudfront.tf | 53 +++++++++++++++++++ terragrunt/modules/rustup/dns.tf | 12 +++++ terragrunt/modules/rustup/variables.tf | 4 ++ 5 files changed, 86 insertions(+) create mode 100644 terragrunt/modules/rustup/certificate.tf create mode 100644 terragrunt/modules/rustup/cloudfront.tf create mode 100644 terragrunt/modules/rustup/dns.tf create mode 100644 terragrunt/modules/rustup/variables.tf diff --git a/terragrunt/accounts/legacy/rustup-prod/rustup/terragrunt.hcl b/terragrunt/accounts/legacy/rustup-prod/rustup/terragrunt.hcl index ad2a2f09b..807b10e25 100644 --- a/terragrunt/accounts/legacy/rustup-prod/rustup/terragrunt.hcl +++ b/terragrunt/accounts/legacy/rustup-prod/rustup/terragrunt.hcl @@ -6,3 +6,7 @@ include { path = find_in_parent_folders() merge_strategy = "deep" } + +inputs = { + builds_domain_name = "rustup-builds.rust-lang.org" +} diff --git a/terragrunt/modules/rustup/certificate.tf b/terragrunt/modules/rustup/certificate.tf new file mode 100644 index 000000000..b821baf8a --- /dev/null +++ b/terragrunt/modules/rustup/certificate.tf @@ -0,0 +1,13 @@ +module "certificate" { + source = "../acm-certificate" + + providers = { + aws = aws.us-east-1 + } + + domains = [ + var.builds_domain_name, + ] + + legacy = true +} diff --git a/terragrunt/modules/rustup/cloudfront.tf b/terragrunt/modules/rustup/cloudfront.tf new file mode 100644 index 000000000..d474ec16b --- /dev/null +++ b/terragrunt/modules/rustup/cloudfront.tf @@ -0,0 +1,53 @@ +resource "aws_cloudfront_distribution" "builds" { + comment = var.builds_domain_name + + enabled = true + wait_for_deployment = false + is_ipv6_enabled = true + price_class = "PriceClass_All" + + aliases = [ + var.builds_domain_name, + ] + + viewer_certificate { + acm_certificate_arn = module.certificate.arn + ssl_support_method = "sni-only" + minimum_protocol_version = "TLSv1.1_2016" + } + + default_cache_behavior { + target_origin_id = "builds" + allowed_methods = ["GET", "HEAD"] + cached_methods = ["GET", "HEAD"] + compress = true + viewer_protocol_policy = "redirect-to-https" + + forwarded_values { + headers = [ + // Following the spec, AWS S3 only replies with the CORS headers when + // an Origin is present, and varies its response based on that. If we + // don't forward the header CloudFront is going to cache the first CORS + // response it receives, even if it's empty. + "Origin", + ] + + query_string = false + + cookies { + forward = "none" + } + } + } + + origin { + origin_id = "builds" + domain_name = aws_s3_bucket.builds.bucket_regional_domain_name + } + + restrictions { + geo_restriction { + restriction_type = "none" + } + } +} diff --git a/terragrunt/modules/rustup/dns.tf b/terragrunt/modules/rustup/dns.tf new file mode 100644 index 000000000..9a1aaee43 --- /dev/null +++ b/terragrunt/modules/rustup/dns.tf @@ -0,0 +1,12 @@ +data "aws_route53_zone" "builds" { + // Convert foo.bar.baz into bar.baz + name = join(".", reverse(slice(reverse(split(".", var.builds_domain_name)), 0, 2))) +} + +resource "aws_route53_record" "cloudfront_builds_domain" { + zone_id = data.aws_route53_zone.builds.id + name = var.builds_domain_name + type = "CNAME" + ttl = 300 + records = [aws_cloudfront_distribution.builds.domain_name] +} diff --git a/terragrunt/modules/rustup/variables.tf b/terragrunt/modules/rustup/variables.tf new file mode 100644 index 000000000..fc75aacc2 --- /dev/null +++ b/terragrunt/modules/rustup/variables.tf @@ -0,0 +1,4 @@ +variable "builds_domain_name" { + description = "The domain for the CloudFront distribution that serves the builds" + type = string +} From ee77ca05c13c1419e3a313f3ba66281e9fca786e Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 13 Aug 2024 15:50:12 +0200 Subject: [PATCH 11/21] Grant CloudFront access to Rustup builds The bucket with Rustup builds is not publicly accessible, so CloudFront requires an origin access policy to access the data in it. --- terragrunt/modules/rustup/cloudfront.tf | 13 +++++++++++-- terragrunt/modules/rustup/s3.tf | 26 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/terragrunt/modules/rustup/cloudfront.tf b/terragrunt/modules/rustup/cloudfront.tf index d474ec16b..15a644033 100644 --- a/terragrunt/modules/rustup/cloudfront.tf +++ b/terragrunt/modules/rustup/cloudfront.tf @@ -41,8 +41,9 @@ resource "aws_cloudfront_distribution" "builds" { } origin { - origin_id = "builds" - domain_name = aws_s3_bucket.builds.bucket_regional_domain_name + origin_id = "builds" + domain_name = aws_s3_bucket.builds.bucket_regional_domain_name + origin_access_control_id = aws_cloudfront_origin_access_control.builds.id } restrictions { @@ -51,3 +52,11 @@ resource "aws_cloudfront_distribution" "builds" { } } } + +resource "aws_cloudfront_origin_access_control" "builds" { + name = "rustup-builds" + description = var.builds_domain_name + origin_access_control_origin_type = "s3" + signing_behavior = "always" + signing_protocol = "sigv4" +} diff --git a/terragrunt/modules/rustup/s3.tf b/terragrunt/modules/rustup/s3.tf index 2e9f13fd0..826924c13 100644 --- a/terragrunt/modules/rustup/s3.tf +++ b/terragrunt/modules/rustup/s3.tf @@ -13,6 +13,32 @@ module "ci_role" { branch = "master" } +resource "aws_s3_bucket_policy" "cloudfront" { + provider = aws.us-east-1 + + bucket = aws_s3_bucket.builds.id + + policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Sid = "AllowCloudFrontReadOnlyAccess" + Effect = "Allow" + Principal = { + Service = "cloudfront.amazonaws.com" + } + Action = ["s3:GetObject"] + Resource = ["${aws_s3_bucket.builds.arn}/*"] + Condition = { + StringEquals = { + "AWS:SourceArn" = aws_cloudfront_distribution.builds.arn + } + } + } + ] + }) +} + resource "aws_iam_policy" "upload_builds" { name = "upload-rustup-builds" policy = jsonencode({ From 850723e3b2060c7fb462acdd0c091aa4f52caa9d Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:55:45 +0200 Subject: [PATCH 12/21] chore: update `external` provider to 2.3.3 --- terraform/team-repo/.terraform.lock.hcl | 95 ++++++++++--------- terraform/team-repo/_terraform.tf | 3 +- .../crates-io/.terraform.lock.hcl | 60 ++++++------ .../crates-io/.terraform.lock.hcl | 60 ++++++------ .../release-distribution/.terraform.lock.hcl | 26 ++--- .../release-distribution/.terraform.lock.hcl | 26 ++--- 6 files changed, 134 insertions(+), 136 deletions(-) diff --git a/terraform/team-repo/.terraform.lock.hcl b/terraform/team-repo/.terraform.lock.hcl index 21d8749fe..48a277a8b 100644 --- a/terraform/team-repo/.terraform.lock.hcl +++ b/terraform/team-repo/.terraform.lock.hcl @@ -2,63 +2,66 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.26.0" - constraints = "~> 4.20" + version = "4.67.0" + constraints = ">= 4.20.0, ~> 4.20, < 6.0.0" hashes = [ - "h1:jt8jLpFFhaapdbBqw4WQpDuLN8y7zF8/iLyCzypDxSQ=", - "zh:0579b105ae471894846fbd740bc9f10b2bd8a48860d8e640b4a9b53fb7d63ffe", - "zh:0ce445cfbffb6c0eee9e0e2a95850b5749d56aa8211b95a686c24dc2847a36ea", - "zh:41f0cf0810363cea4e54f3d9c452f2eb77123bcdaacc18b978c825496168cae2", - "zh:431a7e967b5c9d7ebde6c714abedd9464be6a62f7eafa1808a86a8bd92851317", - "zh:4afebd3c3a8c0646f0874493840b6f8c82f7f4302780faec5c7b0c616077eebe", - "zh:7f077662efc8d7b91ef604999daf6b45a968cb2f5d8c4512a00d2feb4db05a7a", - "zh:9a58d1ef049ccaa9615fe5722ba815065f45d172f8bc656ffdbab4ca16f6b786", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9d30b70a2daa0d94661590f6533e07071d2c7052b8279f05090f1bf037f56607", - "zh:b75f88be5d048849a632895d43b836ed1693031e586cd873ee915b5d3cf4fae6", - "zh:c57ac099b01fe49dd4e1e4674a06f61029fa6316e4f92a6a2a3bdc0444b371f9", - "zh:cb48a175ebb2a12fecae7dc6580bf88fbcf5408cdc53f3cf057150ebe9144034", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } provider "registry.terraform.io/hashicorp/external" { - version = "1.2.0" - constraints = "~> 1.2.0" + version = "2.3.3" + constraints = "~> 2.3.3" hashes = [ - "h1:wDfbBn+171g9/+aWqkicrN5l1S3kuqEX4J1zyPCDsoY=", - "zh:02048f972a31ac87231dd548323ee214cf04944b289c5d9edde82ffbde5b8386", - "zh:06fcf617521916883c5e3cbfa533dded6725246123f18355576a07f40f2ae4b0", - "zh:325dbc165665b3bd31164168bb65bf1f364c4a463cc8a2f8e3639b9738d9b16e", - "zh:5cf47495ec9ec1953f2a94875b23a4f44ff810422f1e63b5ef849fe1138e7aa1", - "zh:6cb3e94f4e795892005328e9a3aa12415b03ce99d6b7c92b3122f4204bb0ee73", - "zh:6d731e12c616434886f007cad68d9313a178ddfb0360de84236fc5593f443c10", - "zh:9a269a735d9e0c3b1390e6319df46ee2d0afc057c32a899ffc885df78d012123", - "zh:a91b5d526011f5ee56461b1d7a9fcb230aab6c38c01facb73ecd98c5e958204e", - "zh:aa5f19ba3040a4a10f4c5290d075544d7cdad4b90fb10a469a1d40cbaf4607e5", - "zh:c986125fda03444ac8c964e999c48db450b452e0b4edf4542e3bee97ca951cbd", - "zh:fddff8f179925c1c76e58302ddcbead9474ea52c6e8141f5ba73bb137ca2ebc5", - "zh:fe2ef9dcc45291d0582bbf1f5936522682cf2e03a3811a8e6968f1ba14d91f25", + "h1:gShzO1rJtADK9tDZMvMgjciVAzsBh39LNjtThCwX1Hg=", + "zh:03d81462f9578ec91ce8e26f887e34151eda0e100f57e9772dbea86363588239", + "zh:37ec2a20f6a3ec3a0fd95d3f3de26da6cb9534b30488bc45723e118a0911c0d8", + "zh:4eb5b119179539f2749ce9de0e1b9629d025990f062f4f4dddc161562bb89d37", + "zh:5a31bb58414f41bee5e09b939012df5b88654120b0238a89dfd6691ba197619a", + "zh:6221a05e52a6a2d4f520ffe7cbc741f4f6080e0855061b0ed54e8be4a84eb9b7", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:8bb068496b4679bef625e4710d9f3432e301c3a56602271f04e60eadf7f8a94c", + "zh:94742aa5378bab626ce34f79bcef6a373e4f86ea7a8b762e9f71270a899e0d00", + "zh:a485831b5a525cd8f40e8982fa37da40ff70b1ae092c8b755fcde123f0b1238d", + "zh:a647ff16d071eabcabd87ea8183eb90a775a0294ddd735d742075d62fff09193", + "zh:b74710c5954aaa3faf262c18d36a8c2407862d9f842c63e7fa92fa4de3d29df6", + "zh:fa73d83edc92af2e551857594c2232ba6a9e3603ad34b0a5940865202c08d8d7", ] } provider "registry.terraform.io/integrations/github" { - version = "4.28.0" - constraints = "~> 4.0, ~> 4.14" + version = "4.31.0" + constraints = "~> 4.14" hashes = [ - "h1:PRj9EXEvLgKTmQHKUtzIG28goXJX74aRt0b/4JH6qN8=", - "zh:125a1decda8a9d4c6d18010f3c66943c868da9e984298c0e2f9dfd240ec660ec", - "zh:23a4cb334a2fbead38264f434c81e52cb52fb115cbc39537fefc9c22aaecdf35", - "zh:3cf793b1d0bc30a703315c6ecb6bb2f36d14ed310dec7e300ae4a4a3a470aafe", - "zh:47cb06845730df19256882272690221db8314199a34012ac7e690e0550ca9404", - "zh:5d6e76624d60b6298ee47c10cc262adc9f361f4648f40faf81ee3a8d6beaad31", - "zh:6415a5c6ba5b28f1f410845706cff0390718113f7d987aaa011553b041ba2005", - "zh:70ce96d7aa424aef47d4b049d39aff036ae6377dacd5c077501eb0f353901cc6", - "zh:9803fc59cf71ea629308773d429c9ca00985acdcc02d9755fc59900bcf6d1d00", - "zh:a9a505f208f569ee44a0a6a7c975e3441bb8d61dbf9831c44c3be299e2cf1a21", - "zh:a9d9a17b0618ea14f9fa49dfc1329b01473a9d708011fca32cd01b474051d169", - "zh:bce0257085a5d6c9f0e6cdd5a704c50286c5382f840384a2a50c69d8488652bf", - "zh:d7272bb396e67ff22d7f4628d152fa66610cf7507a4e63d72ef50fde651e39bf", - "zh:e2aab496c17acb8c2bdd5af9e830e9f91f869d9fc173e6dd65b7475e8baa6f82", - "zh:ea20984a5386fc4a6856eed58d261c5124fc8ca72bc6ee142c1092036a3c8360", + "h1:FkBft5JlVtlcYcEM0CiphlFWgjBFQVziJMwrowuBIoc=", + "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", + "zh:0dca3802a7ea1ba4812c866bf202e62aef6c8995db8856fdb5b4d1d81b505518", + "zh:24e6a56b34b3e0dca6ca0d6f22d0a31dda6a3256713492902c39ce9edd14acbd", + "zh:42e41fa4e61218973615b7e5d564119bb5c728ee40b881539964cd704632d8c0", + "zh:6aa6bb04fdc00c3c762122e96ee7c19abfb8e42dc5d3a720b5767dbb4cfa274d", + "zh:74ea4bbad825eee831d37940760459786460fe492e1b30acb5c91c9edd14a5ea", + "zh:8e170f6d5e46c08fbc3b5ff251075382f75b53a66a83b7b005099fb99ad94f24", + "zh:9164b611e7318e3d08cc84513d3d8c27bd12336a7721a894cb3d346b60286233", + "zh:91d3397f021c5a9fedff36f84635ffc3169224494629bb4a578356a05091e182", + "zh:b061e1529499bf40f8f14c9c8116787dd50f6fd3d64ad38d77cd39db77e98ae9", + "zh:c9daff626f7a55c01db79b6ccc462948bf854d976c73def306ae9ae09e5afe1b", + "zh:ec7e223ae7d6292b8425b7190e801f1098a647d2aee3132761d37fd75cfcfe07", + "zh:f2001b2a2f7049fc74ffe54d7bc48c9dfec80956f468a2c8a550c5071d077dbd", + "zh:f75ec1e71924c50b346bced15883c626f697ffd3ee6c4bb2835e4170fe65215a", ] } diff --git a/terraform/team-repo/_terraform.tf b/terraform/team-repo/_terraform.tf index c391fc0de..7d57b3ace 100644 --- a/terraform/team-repo/_terraform.tf +++ b/terraform/team-repo/_terraform.tf @@ -10,7 +10,7 @@ terraform { } external = { source = "hashicorp/external" - version = "~> 1.2.0" + version = "~> 2.3.3" } github = { source = "integrations/github" @@ -42,4 +42,3 @@ data "terraform_remote_state" "shared" { region = "us-west-1" } } - diff --git a/terragrunt/accounts/legacy/crates-io-prod/crates-io/.terraform.lock.hcl b/terragrunt/accounts/legacy/crates-io-prod/crates-io/.terraform.lock.hcl index 44cdf7d69..f803a14ae 100644 --- a/terragrunt/accounts/legacy/crates-io-prod/crates-io/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/crates-io-prod/crates-io/.terraform.lock.hcl @@ -24,45 +24,43 @@ provider "registry.terraform.io/fastly/fastly" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.45.0" + version = "4.67.0" constraints = "~> 4.20" hashes = [ - "h1:AKX4R3U+kBpQB5oU08kSrzl5CLsMhbK+BKZVrwYDXZQ=", - "h1:J/XjRsEJIpxi+mczXQfnH3nvfACv3LRDtrthQJCIibY=", - "zh:22da03786f25658a000d1bcc28c780816a97e7e8a1f59fff6eee7d452830e95e", - "zh:2543be56eee0491eb0c79ca1c901dcbf71da26625961fe719f088263fef062f4", - "zh:31a1da1e3beedfd88c3c152ab505bdcf330427f26b75835885526f7bb75c4857", - "zh:4409afe50f225659d5f378fe9303a45052953a1219f7f1acc82b69d07528b7ba", - "zh:4dadec3b783f10d2f8eef3dab5e817baae9c932a7967d45fe3d77fcbcbdaa438", - "zh:55be80d6e24828dcb0db7a0226fb275415c1c0ad63dd2f33b76f3ac0cd64e6a6", - "zh:560bba29efb7dbe0bfcc937369d88817aa31a8d18aa25395b1afe2576cb04495", - "zh:6caacc202e83438ff63d5d96733e283f44e349668d96c6b1c5c7df463ebf85cc", - "zh:6cabab83a61d5b4ac801c5a5d57556a0e76ec8dc879d28cf777509db5f6a657e", - "zh:96c4528bf9c16edb8841b68479ec51c499ed7fa680462fa28caeab3fc168bb43", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:cdc0b47ff840d708fbf75abfe86d23dc7f1dffdd233a771822a17b5c637f4769", - "zh:d9a9583e82776d1ebb6cf6c3d47acc2b302f8778f470ceffe7579dc794eb1feb", - "zh:e9367ca9f6f6418a23cdf8d01f29dd0c4f614e78499f52a767a422e4c334b915", - "zh:f6d355a2fb3bcebb597f68bbca4fa2aaa364efd29240236c582375e219d77656", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } provider "registry.terraform.io/hashicorp/external" { - version = "2.2.3" + version = "2.3.3" hashes = [ - "h1:648ZjJR81c2W1OLtYmUQa9/1rGr3vvZSuX9dR1ucGWY=", - "h1:uvOYRWcVIqOZSl8YjjaB18yZFz1AWIt2CnK7O45rckg=", - "zh:184ecd339d764de845db0e5b8a9c87893dcd0c9d822167f73658f89d80ec31c9", - "zh:2661eaca31d17d6bbb18a8f673bbfe3fe1b9b7326e60d0ceb302017003274e3c", - "zh:2c0a180f6d1fc2ba6e03f7dfc5f73b617e45408681f75bca75aa82f3796df0e4", - "zh:4b92ae44c6baef4c4952c47be00541055cb5280dd3bc8031dba5a1b2ee982387", - "zh:5641694d5daf3893d7ea90be03b6fa575211a08814ffe70998d5adb8b59cdc0a", - "zh:5bd55a2be8a1c20d732ac9c604b839e1cadc8c49006315dffa4d709b6874df32", - "zh:6e0ef5d11e1597202424b7d69b9da7b881494c9b13a3d4026fc47012dc651c79", + "h1:gShzO1rJtADK9tDZMvMgjciVAzsBh39LNjtThCwX1Hg=", + "zh:03d81462f9578ec91ce8e26f887e34151eda0e100f57e9772dbea86363588239", + "zh:37ec2a20f6a3ec3a0fd95d3f3de26da6cb9534b30488bc45723e118a0911c0d8", + "zh:4eb5b119179539f2749ce9de0e1b9629d025990f062f4f4dddc161562bb89d37", + "zh:5a31bb58414f41bee5e09b939012df5b88654120b0238a89dfd6691ba197619a", + "zh:6221a05e52a6a2d4f520ffe7cbc741f4f6080e0855061b0ed54e8be4a84eb9b7", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9e19f89fa25004d3b926a8d15ea630b4bde62f1fa4ed5e11a3d27aabddb77353", - "zh:b763efdd69fd097616b4a4c89cf333b4cee9699ac6432d73d2756f8335d1213f", - "zh:e3b561efdee510b2b445f76a52a902c52bee8e13095e7f4bed7c80f10f8d294a", - "zh:fe660bb8781ee043a093b9a20e53069974475dcaa5791a1f45fd03c61a26478a", + "zh:8bb068496b4679bef625e4710d9f3432e301c3a56602271f04e60eadf7f8a94c", + "zh:94742aa5378bab626ce34f79bcef6a373e4f86ea7a8b762e9f71270a899e0d00", + "zh:a485831b5a525cd8f40e8982fa37da40ff70b1ae092c8b755fcde123f0b1238d", + "zh:a647ff16d071eabcabd87ea8183eb90a775a0294ddd735d742075d62fff09193", + "zh:b74710c5954aaa3faf262c18d36a8c2407862d9f842c63e7fa92fa4de3d29df6", + "zh:fa73d83edc92af2e551857594c2232ba6a9e3603ad34b0a5940865202c08d8d7", ] } diff --git a/terragrunt/accounts/legacy/crates-io-staging/crates-io/.terraform.lock.hcl b/terragrunt/accounts/legacy/crates-io-staging/crates-io/.terraform.lock.hcl index db36d7445..e99b023a5 100644 --- a/terragrunt/accounts/legacy/crates-io-staging/crates-io/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/crates-io-staging/crates-io/.terraform.lock.hcl @@ -25,45 +25,43 @@ provider "registry.terraform.io/fastly/fastly" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.45.0" + version = "4.67.0" constraints = "~> 4.20" hashes = [ - "h1:AKX4R3U+kBpQB5oU08kSrzl5CLsMhbK+BKZVrwYDXZQ=", - "h1:J/XjRsEJIpxi+mczXQfnH3nvfACv3LRDtrthQJCIibY=", - "zh:22da03786f25658a000d1bcc28c780816a97e7e8a1f59fff6eee7d452830e95e", - "zh:2543be56eee0491eb0c79ca1c901dcbf71da26625961fe719f088263fef062f4", - "zh:31a1da1e3beedfd88c3c152ab505bdcf330427f26b75835885526f7bb75c4857", - "zh:4409afe50f225659d5f378fe9303a45052953a1219f7f1acc82b69d07528b7ba", - "zh:4dadec3b783f10d2f8eef3dab5e817baae9c932a7967d45fe3d77fcbcbdaa438", - "zh:55be80d6e24828dcb0db7a0226fb275415c1c0ad63dd2f33b76f3ac0cd64e6a6", - "zh:560bba29efb7dbe0bfcc937369d88817aa31a8d18aa25395b1afe2576cb04495", - "zh:6caacc202e83438ff63d5d96733e283f44e349668d96c6b1c5c7df463ebf85cc", - "zh:6cabab83a61d5b4ac801c5a5d57556a0e76ec8dc879d28cf777509db5f6a657e", - "zh:96c4528bf9c16edb8841b68479ec51c499ed7fa680462fa28caeab3fc168bb43", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:cdc0b47ff840d708fbf75abfe86d23dc7f1dffdd233a771822a17b5c637f4769", - "zh:d9a9583e82776d1ebb6cf6c3d47acc2b302f8778f470ceffe7579dc794eb1feb", - "zh:e9367ca9f6f6418a23cdf8d01f29dd0c4f614e78499f52a767a422e4c334b915", - "zh:f6d355a2fb3bcebb597f68bbca4fa2aaa364efd29240236c582375e219d77656", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } provider "registry.terraform.io/hashicorp/external" { - version = "2.2.3" + version = "2.3.3" hashes = [ - "h1:648ZjJR81c2W1OLtYmUQa9/1rGr3vvZSuX9dR1ucGWY=", - "h1:uvOYRWcVIqOZSl8YjjaB18yZFz1AWIt2CnK7O45rckg=", - "zh:184ecd339d764de845db0e5b8a9c87893dcd0c9d822167f73658f89d80ec31c9", - "zh:2661eaca31d17d6bbb18a8f673bbfe3fe1b9b7326e60d0ceb302017003274e3c", - "zh:2c0a180f6d1fc2ba6e03f7dfc5f73b617e45408681f75bca75aa82f3796df0e4", - "zh:4b92ae44c6baef4c4952c47be00541055cb5280dd3bc8031dba5a1b2ee982387", - "zh:5641694d5daf3893d7ea90be03b6fa575211a08814ffe70998d5adb8b59cdc0a", - "zh:5bd55a2be8a1c20d732ac9c604b839e1cadc8c49006315dffa4d709b6874df32", - "zh:6e0ef5d11e1597202424b7d69b9da7b881494c9b13a3d4026fc47012dc651c79", + "h1:gShzO1rJtADK9tDZMvMgjciVAzsBh39LNjtThCwX1Hg=", + "zh:03d81462f9578ec91ce8e26f887e34151eda0e100f57e9772dbea86363588239", + "zh:37ec2a20f6a3ec3a0fd95d3f3de26da6cb9534b30488bc45723e118a0911c0d8", + "zh:4eb5b119179539f2749ce9de0e1b9629d025990f062f4f4dddc161562bb89d37", + "zh:5a31bb58414f41bee5e09b939012df5b88654120b0238a89dfd6691ba197619a", + "zh:6221a05e52a6a2d4f520ffe7cbc741f4f6080e0855061b0ed54e8be4a84eb9b7", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9e19f89fa25004d3b926a8d15ea630b4bde62f1fa4ed5e11a3d27aabddb77353", - "zh:b763efdd69fd097616b4a4c89cf333b4cee9699ac6432d73d2756f8335d1213f", - "zh:e3b561efdee510b2b445f76a52a902c52bee8e13095e7f4bed7c80f10f8d294a", - "zh:fe660bb8781ee043a093b9a20e53069974475dcaa5791a1f45fd03c61a26478a", + "zh:8bb068496b4679bef625e4710d9f3432e301c3a56602271f04e60eadf7f8a94c", + "zh:94742aa5378bab626ce34f79bcef6a373e4f86ea7a8b762e9f71270a899e0d00", + "zh:a485831b5a525cd8f40e8982fa37da40ff70b1ae092c8b755fcde123f0b1238d", + "zh:a647ff16d071eabcabd87ea8183eb90a775a0294ddd735d742075d62fff09193", + "zh:b74710c5954aaa3faf262c18d36a8c2407862d9f842c63e7fa92fa4de3d29df6", + "zh:fa73d83edc92af2e551857594c2232ba6a9e3603ad34b0a5940865202c08d8d7", ] } diff --git a/terragrunt/accounts/legacy/releases-dev/release-distribution/.terraform.lock.hcl b/terragrunt/accounts/legacy/releases-dev/release-distribution/.terraform.lock.hcl index ac70daf3c..7fe9385df 100644 --- a/terragrunt/accounts/legacy/releases-dev/release-distribution/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/releases-dev/release-distribution/.terraform.lock.hcl @@ -47,20 +47,20 @@ provider "registry.terraform.io/hashicorp/aws" { } provider "registry.terraform.io/hashicorp/external" { - version = "2.3.1" + version = "2.3.3" hashes = [ - "h1:gznGscVJ0USxy4CdihpjRKPsKvyGr/zqPvBoFLJTQDc=", - "zh:001e2886dc81fc98cf17cf34c0d53cb2dae1e869464792576e11b0f34ee92f54", - "zh:2eeac58dd75b1abdf91945ac4284c9ccb2bfb17fa9bdb5f5d408148ff553b3ee", - "zh:2fc39079ba61411a737df2908942e6970cb67ed2f4fb19090cd44ce2082903dd", - "zh:472a71c624952cff7aa98a7b967f6c7bb53153dbd2b8f356ceb286e6743bb4e2", - "zh:4cff06d31272aac8bc35e9b7faec42cf4554cbcbae1092eaab6ab7f643c215d9", + "h1:gShzO1rJtADK9tDZMvMgjciVAzsBh39LNjtThCwX1Hg=", + "zh:03d81462f9578ec91ce8e26f887e34151eda0e100f57e9772dbea86363588239", + "zh:37ec2a20f6a3ec3a0fd95d3f3de26da6cb9534b30488bc45723e118a0911c0d8", + "zh:4eb5b119179539f2749ce9de0e1b9629d025990f062f4f4dddc161562bb89d37", + "zh:5a31bb58414f41bee5e09b939012df5b88654120b0238a89dfd6691ba197619a", + "zh:6221a05e52a6a2d4f520ffe7cbc741f4f6080e0855061b0ed54e8be4a84eb9b7", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:7ed16ccd2049fa089616b98c0bd57219f407958f318f3c697843e2397ddf70df", - "zh:842696362c92bf2645eb85c739410fd51376be6c488733efae44f4ce688da50e", - "zh:8985129f2eccfd7f1841ce06f3bf2bbede6352ec9e9f926fbaa6b1a05313b326", - "zh:a5f0602d8ec991a5411ef42f872aa90f6347e93886ce67905c53cfea37278e05", - "zh:bf4ab82cbe5256dcef16949973bf6aa1a98c2c73a98d6a44ee7bc40809d002b8", - "zh:e70770be62aa70198fa899526d671643ff99eecf265bf1a50e798fc3480bd417", + "zh:8bb068496b4679bef625e4710d9f3432e301c3a56602271f04e60eadf7f8a94c", + "zh:94742aa5378bab626ce34f79bcef6a373e4f86ea7a8b762e9f71270a899e0d00", + "zh:a485831b5a525cd8f40e8982fa37da40ff70b1ae092c8b755fcde123f0b1238d", + "zh:a647ff16d071eabcabd87ea8183eb90a775a0294ddd735d742075d62fff09193", + "zh:b74710c5954aaa3faf262c18d36a8c2407862d9f842c63e7fa92fa4de3d29df6", + "zh:fa73d83edc92af2e551857594c2232ba6a9e3603ad34b0a5940865202c08d8d7", ] } diff --git a/terragrunt/accounts/legacy/releases-prod/release-distribution/.terraform.lock.hcl b/terragrunt/accounts/legacy/releases-prod/release-distribution/.terraform.lock.hcl index ac70daf3c..7fe9385df 100644 --- a/terragrunt/accounts/legacy/releases-prod/release-distribution/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/releases-prod/release-distribution/.terraform.lock.hcl @@ -47,20 +47,20 @@ provider "registry.terraform.io/hashicorp/aws" { } provider "registry.terraform.io/hashicorp/external" { - version = "2.3.1" + version = "2.3.3" hashes = [ - "h1:gznGscVJ0USxy4CdihpjRKPsKvyGr/zqPvBoFLJTQDc=", - "zh:001e2886dc81fc98cf17cf34c0d53cb2dae1e869464792576e11b0f34ee92f54", - "zh:2eeac58dd75b1abdf91945ac4284c9ccb2bfb17fa9bdb5f5d408148ff553b3ee", - "zh:2fc39079ba61411a737df2908942e6970cb67ed2f4fb19090cd44ce2082903dd", - "zh:472a71c624952cff7aa98a7b967f6c7bb53153dbd2b8f356ceb286e6743bb4e2", - "zh:4cff06d31272aac8bc35e9b7faec42cf4554cbcbae1092eaab6ab7f643c215d9", + "h1:gShzO1rJtADK9tDZMvMgjciVAzsBh39LNjtThCwX1Hg=", + "zh:03d81462f9578ec91ce8e26f887e34151eda0e100f57e9772dbea86363588239", + "zh:37ec2a20f6a3ec3a0fd95d3f3de26da6cb9534b30488bc45723e118a0911c0d8", + "zh:4eb5b119179539f2749ce9de0e1b9629d025990f062f4f4dddc161562bb89d37", + "zh:5a31bb58414f41bee5e09b939012df5b88654120b0238a89dfd6691ba197619a", + "zh:6221a05e52a6a2d4f520ffe7cbc741f4f6080e0855061b0ed54e8be4a84eb9b7", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:7ed16ccd2049fa089616b98c0bd57219f407958f318f3c697843e2397ddf70df", - "zh:842696362c92bf2645eb85c739410fd51376be6c488733efae44f4ce688da50e", - "zh:8985129f2eccfd7f1841ce06f3bf2bbede6352ec9e9f926fbaa6b1a05313b326", - "zh:a5f0602d8ec991a5411ef42f872aa90f6347e93886ce67905c53cfea37278e05", - "zh:bf4ab82cbe5256dcef16949973bf6aa1a98c2c73a98d6a44ee7bc40809d002b8", - "zh:e70770be62aa70198fa899526d671643ff99eecf265bf1a50e798fc3480bd417", + "zh:8bb068496b4679bef625e4710d9f3432e301c3a56602271f04e60eadf7f8a94c", + "zh:94742aa5378bab626ce34f79bcef6a373e4f86ea7a8b762e9f71270a899e0d00", + "zh:a485831b5a525cd8f40e8982fa37da40ff70b1ae092c8b755fcde123f0b1238d", + "zh:a647ff16d071eabcabd87ea8183eb90a775a0294ddd735d742075d62fff09193", + "zh:b74710c5954aaa3faf262c18d36a8c2407862d9f842c63e7fa92fa4de3d29df6", + "zh:fa73d83edc92af2e551857594c2232ba6a9e3603ad34b0a5940865202c08d8d7", ] } From 9803073a6225808d032e564e0b9b0e91112cad4d Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:56:18 +0200 Subject: [PATCH 13/21] update crates-io-prod --- terragrunt/accounts/crates-io-prod/deployed-ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/accounts/crates-io-prod/deployed-ref b/terragrunt/accounts/crates-io-prod/deployed-ref index e38c8bfa9..b7851db75 100644 --- a/terragrunt/accounts/crates-io-prod/deployed-ref +++ b/terragrunt/accounts/crates-io-prod/deployed-ref @@ -1 +1 @@ -555f7ecaaf8662f018b35ec81681cf0260bdb04f +850723e3b2060c7fb462acdd0c091aa4f52caa9d From d059c9d8393a7614d657a8ba18fa877a0b76e808 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:24:00 +0200 Subject: [PATCH 14/21] chore(team-repo): update fastly to 5.11.0 --- .../team-members-fastly/.terraform.lock.hcl | 34 +++++++++---------- terraform/team-members-fastly/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/team-members-fastly/.terraform.lock.hcl b/terraform/team-members-fastly/.terraform.lock.hcl index 90157088a..8ee7082fa 100644 --- a/terraform/team-members-fastly/.terraform.lock.hcl +++ b/terraform/team-members-fastly/.terraform.lock.hcl @@ -2,23 +2,23 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/fastly/fastly" { - version = "2.4.0" - constraints = "2.4.0" + version = "5.11.0" + constraints = "5.11.0" hashes = [ - "h1:1Qn/eL2jnrWE6iUyvpLaBqgJLM456RO/ffFWoyZEBqE=", - "zh:1ef79460d5805ca2074e859694331951ab689371ed359dd2730bc6bd76bd997a", - "zh:25e2d2c64527ea9a4b4f8b616377dab459f5152b527f8c6b823e222fd763d400", - "zh:2ed0ece471bf655aac951235a877a62ab92022e84b33c57c213e275851880fec", - "zh:42a94f0b0df30b982222cbc3d38ae18be8781abe6610f524cbc174627ee8991a", - "zh:485762cec3c5d125163711056d70284c0a5104cf0692b2db836bbee56f9749a0", - "zh:6114c159b1c2367d954c433d3e4859c6627e05fd9988589776faf5c9f8542680", - "zh:62b401567678ce2e2f2467b0419ac69a6a1ddf2fe923d88a3f437c2002891668", - "zh:7b63075521f3122b3e17d112d85eabfd16a80af6e41c62f4e09371a2b7c7e40f", - "zh:848ab7c895e30ee980d00fa2195cd31b248aea3883be36619491f6abceac59ba", - "zh:acfb52ba765ceaa452b0de75c2e9aa660d55e2a78b226fb19f45e664a54a6f51", - "zh:bd39f27f7c6b103a7d65d8b8738034bd3e84a9e9edaf09478845724b3b0c547b", - "zh:cd65dd759f5b335fd79ac549878ed983aca1d8fc6b4b4ca12c32f47407505203", - "zh:eaed4020a7911b917050124b18f7a0612b80a012b357cbc04eab5aa8809982e3", - "zh:f1baa0c014a7f9056a94b080102b390e377f3bb0bff3aeff9e8b89bcb42b304e", + "h1:kv4rW+6dyoJHxbZswm0vC4+e96D7NlzGo/sa6Psr4hU=", + "zh:0a209382e7644ceb6d0c871109cb730e772ac436f63a5c5814d12a476cc72986", + "zh:38efbb97d1aa2ae056fd9f8189a4773e29140af4a2a6d42fa37ae67a549c7649", + "zh:59bc24ff24197fd1bf428aa6ac213ea07ddea9ca33f71c3916578c7983e834c6", + "zh:66685d0635de949de8d9d685ea46c8714e06833cb2817e06284e278ecbad29cd", + "zh:71bbd37e880007c0bc3838dbb58847a7b6470c12d2278f91095c735760df0138", + "zh:7f74a806b384682e9f8d359b03e61904a45c4e618207edc31aeae2430daa21d6", + "zh:8114e395890a44973e08d134b057014c493a70087bd7e757fa6a680e5109f4a1", + "zh:8b4fd50aea90cda18519ba260f295afa4d55bdd951daca4c4bffb10e7920796f", + "zh:9783df35130f247ce8e58fc9ec601aeabd4cce065c382795e10a6503c7b42053", + "zh:d7c1323e48d323eef73ad1c84dcb5fbdfa4a79953337582e4f995dab73bf69df", + "zh:d938c14524d6c868c5a5803dcd572a0beb38f39059685f3222b9a465c08eda2d", + "zh:e8dfdf179c442cfe00c2981d0d997488eb9ca207226f9549e9bd3a258e783d2e", + "zh:f756a5fe204792ca10b0d2416491741b4199324bd6019706a65abfce78a4fcc7", + "zh:f9341da542f8dcd5c3ac1011fb937df596a0176f594dc0cb93a424fbcabb2ae2", ] } diff --git a/terraform/team-members-fastly/_terraform.tf b/terraform/team-members-fastly/_terraform.tf index d2dac9750..aac498455 100644 --- a/terraform/team-members-fastly/_terraform.tf +++ b/terraform/team-members-fastly/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { fastly = { source = "fastly/fastly" - version = "2.4.0" + version = "5.11.0" } } From 585e9aabc4a5387af5c7aaebd68b095c1fcf89af Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 19 Aug 2024 11:41:17 +0200 Subject: [PATCH 15/21] chore: update fastly provider --- .../crates-io/.terraform.lock.hcl | 35 +++++++++---------- .../legacy/datadog-fastly/.terraform.lock.hcl | 34 +++++++++--------- .../release-distribution/.terraform.lock.hcl | 34 +++++++++--------- terragrunt/modules/crates-io/_terraform.tf | 2 +- .../modules/datadog-fastly/_terraform.tf | 2 +- .../fastly-tls-subscription/_terraform.tf | 3 +- .../release-distribution/_terraform.tf | 2 +- 7 files changed, 55 insertions(+), 57 deletions(-) diff --git a/terragrunt/accounts/legacy/crates-io-staging/crates-io/.terraform.lock.hcl b/terragrunt/accounts/legacy/crates-io-staging/crates-io/.terraform.lock.hcl index e99b023a5..592e9595c 100644 --- a/terragrunt/accounts/legacy/crates-io-staging/crates-io/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/crates-io-staging/crates-io/.terraform.lock.hcl @@ -2,25 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/fastly/fastly" { - version = "5.0.0" - constraints = "5.0.0" + version = "5.11.0" + constraints = "5.11.0" hashes = [ - "h1:9E2Fj277L+xx7zI7bNHa2iXat/WY6s4au2v1x6u4yjo=", - "h1:Q7RTj5hwsrfvuRxVrvc2opR2I85pZ+KqC6vUhnEfTE8=", - "zh:22e09df92cf4fc6880afff94c092bd7ab1f93fb2c5ae2b75414494de033c85b9", - "zh:251e7ec86eb5f1cb91bdfc2fe581eb048ca8d2df41f701407f6f072a268a8fa3", - "zh:27471e592e5210e0e682d29b024314fc45c9ec43631d0212760dc6e2afc84046", - "zh:32e25f5c509ffcb07ed6f7249f90b9211a0b3ac8b18268526961228d4f652852", - "zh:6c566bd62c6d8014f5f8af293c0071db8481b6e259e4d0b556d2ddb538257cb4", - "zh:912387ab7a7878d7cc718e73fbbb0d64ebd8dfb784bcb07b40dacb3f431c1a39", - "zh:a3eaf12f92c333c2d41d6dd95dbae24a4fa9aa198fb4bc42a50aa9925231c7ec", - "zh:bdd4fddd3c604ea1a0c0aac9952e2a3e236894d044e53ddca72e57c9f4ab7f33", - "zh:bf49558dcc9d1d4f9affa32dc62f631949d3d626e77b3c53200114a87e1ce9a3", - "zh:c552a2c920e26f8b53b8a2786531385f6c057deba3c22c5cd1041acf857a3ccb", - "zh:c8dae06397e415adc60573cd953789a98253657910846b90c87fa9db8fd672ff", - "zh:de2f71e246971663a5af7cac26385a8ab87b2ec837072fd060749bb32d7f21a2", - "zh:e2b8cd933535997a75da8e0eb4886b2afbad73d104f0a62ce622fa27d722b0f2", - "zh:fc699bdd98aec84ddac8121f5b58028de28685f0426b35c74df92d35acc3144d", + "h1:kv4rW+6dyoJHxbZswm0vC4+e96D7NlzGo/sa6Psr4hU=", + "zh:0a209382e7644ceb6d0c871109cb730e772ac436f63a5c5814d12a476cc72986", + "zh:38efbb97d1aa2ae056fd9f8189a4773e29140af4a2a6d42fa37ae67a549c7649", + "zh:59bc24ff24197fd1bf428aa6ac213ea07ddea9ca33f71c3916578c7983e834c6", + "zh:66685d0635de949de8d9d685ea46c8714e06833cb2817e06284e278ecbad29cd", + "zh:71bbd37e880007c0bc3838dbb58847a7b6470c12d2278f91095c735760df0138", + "zh:7f74a806b384682e9f8d359b03e61904a45c4e618207edc31aeae2430daa21d6", + "zh:8114e395890a44973e08d134b057014c493a70087bd7e757fa6a680e5109f4a1", + "zh:8b4fd50aea90cda18519ba260f295afa4d55bdd951daca4c4bffb10e7920796f", + "zh:9783df35130f247ce8e58fc9ec601aeabd4cce065c382795e10a6503c7b42053", + "zh:d7c1323e48d323eef73ad1c84dcb5fbdfa4a79953337582e4f995dab73bf69df", + "zh:d938c14524d6c868c5a5803dcd572a0beb38f39059685f3222b9a465c08eda2d", + "zh:e8dfdf179c442cfe00c2981d0d997488eb9ca207226f9549e9bd3a258e783d2e", + "zh:f756a5fe204792ca10b0d2416491741b4199324bd6019706a65abfce78a4fcc7", + "zh:f9341da542f8dcd5c3ac1011fb937df596a0176f594dc0cb93a424fbcabb2ae2", ] } diff --git a/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl b/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl index 8043c62b1..9e19962b1 100644 --- a/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl @@ -24,24 +24,24 @@ provider "registry.terraform.io/datadog/datadog" { } provider "registry.terraform.io/fastly/fastly" { - version = "5.2.2" - constraints = "5.2.2" + version = "5.11.0" + constraints = "5.11.0" hashes = [ - "h1:XU/wXGPd2IyZ0TcKlvqFjr3G0rEPJHxHlVsswaQC/YE=", - "zh:011657cf0f9aefeb70fa4c099a6511f965cba6b1cab7ee18ed291e12202daa1d", - "zh:11e9d2d15d96e00073449508109352925573547ec0e4f65c6d484044e85a518e", - "zh:174e92d67dd9ed26d7e580039108256a15690cc6c59eefd4cb8fe8555110cdb5", - "zh:28e9cfdebc92e737391ba94c2b4eb3bbd52af3102dfb631a18d0f51aa96e0355", - "zh:43777d7715ec8e9e2a08bd045368e02638d7f6857d7ec2ceb339c4dd400bf0f6", - "zh:46d3a54a11c5f2f44f58afe09c278363367991d4c5e5c9f1c8ede51dd4b6663b", - "zh:6d4275857ba1786167b71fafcaa28ab3805b39af89e16cce6e7b8082a225e6d6", - "zh:93d7dc03a09ca3dd8e3ad16615ccb5e41f233a82c493cc1e6c380c34452f882c", - "zh:9b7a27655e036aca4b05d58891e5619e74c52f7fb0856163a715d48ed318c7f1", - "zh:ac0b498ed29b986a1bdec7a885ef802501ada2aaf1e653a663fe47e7d84de583", - "zh:ad57327147ea5c17ff68026984c2b327150dbbce1fd5a2a5b7d5593dbbed4a47", - "zh:c5fcb420e118f976373145d4393b100ecabd23b6e50b9ec9933c70c92b350d63", - "zh:d83cfcc86a21389ad0a80e0a55e14794d9488a2b856158c6e5c84c44e7ab7416", - "zh:f757a6ccc1fb88cd9317ff984f34cac1c17f40d2ca2b2bda0385ecef90b32c6c", + "h1:kv4rW+6dyoJHxbZswm0vC4+e96D7NlzGo/sa6Psr4hU=", + "zh:0a209382e7644ceb6d0c871109cb730e772ac436f63a5c5814d12a476cc72986", + "zh:38efbb97d1aa2ae056fd9f8189a4773e29140af4a2a6d42fa37ae67a549c7649", + "zh:59bc24ff24197fd1bf428aa6ac213ea07ddea9ca33f71c3916578c7983e834c6", + "zh:66685d0635de949de8d9d685ea46c8714e06833cb2817e06284e278ecbad29cd", + "zh:71bbd37e880007c0bc3838dbb58847a7b6470c12d2278f91095c735760df0138", + "zh:7f74a806b384682e9f8d359b03e61904a45c4e618207edc31aeae2430daa21d6", + "zh:8114e395890a44973e08d134b057014c493a70087bd7e757fa6a680e5109f4a1", + "zh:8b4fd50aea90cda18519ba260f295afa4d55bdd951daca4c4bffb10e7920796f", + "zh:9783df35130f247ce8e58fc9ec601aeabd4cce065c382795e10a6503c7b42053", + "zh:d7c1323e48d323eef73ad1c84dcb5fbdfa4a79953337582e4f995dab73bf69df", + "zh:d938c14524d6c868c5a5803dcd572a0beb38f39059685f3222b9a465c08eda2d", + "zh:e8dfdf179c442cfe00c2981d0d997488eb9ca207226f9549e9bd3a258e783d2e", + "zh:f756a5fe204792ca10b0d2416491741b4199324bd6019706a65abfce78a4fcc7", + "zh:f9341da542f8dcd5c3ac1011fb937df596a0176f594dc0cb93a424fbcabb2ae2", ] } diff --git a/terragrunt/accounts/legacy/releases-dev/release-distribution/.terraform.lock.hcl b/terragrunt/accounts/legacy/releases-dev/release-distribution/.terraform.lock.hcl index 7fe9385df..a9124f41e 100644 --- a/terragrunt/accounts/legacy/releases-dev/release-distribution/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/releases-dev/release-distribution/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/fastly/fastly" { - version = "5.0.0" - constraints = "5.0.0" + version = "5.11.0" + constraints = "5.11.0" hashes = [ - "h1:Q7RTj5hwsrfvuRxVrvc2opR2I85pZ+KqC6vUhnEfTE8=", - "zh:22e09df92cf4fc6880afff94c092bd7ab1f93fb2c5ae2b75414494de033c85b9", - "zh:251e7ec86eb5f1cb91bdfc2fe581eb048ca8d2df41f701407f6f072a268a8fa3", - "zh:27471e592e5210e0e682d29b024314fc45c9ec43631d0212760dc6e2afc84046", - "zh:32e25f5c509ffcb07ed6f7249f90b9211a0b3ac8b18268526961228d4f652852", - "zh:6c566bd62c6d8014f5f8af293c0071db8481b6e259e4d0b556d2ddb538257cb4", - "zh:912387ab7a7878d7cc718e73fbbb0d64ebd8dfb784bcb07b40dacb3f431c1a39", - "zh:a3eaf12f92c333c2d41d6dd95dbae24a4fa9aa198fb4bc42a50aa9925231c7ec", - "zh:bdd4fddd3c604ea1a0c0aac9952e2a3e236894d044e53ddca72e57c9f4ab7f33", - "zh:bf49558dcc9d1d4f9affa32dc62f631949d3d626e77b3c53200114a87e1ce9a3", - "zh:c552a2c920e26f8b53b8a2786531385f6c057deba3c22c5cd1041acf857a3ccb", - "zh:c8dae06397e415adc60573cd953789a98253657910846b90c87fa9db8fd672ff", - "zh:de2f71e246971663a5af7cac26385a8ab87b2ec837072fd060749bb32d7f21a2", - "zh:e2b8cd933535997a75da8e0eb4886b2afbad73d104f0a62ce622fa27d722b0f2", - "zh:fc699bdd98aec84ddac8121f5b58028de28685f0426b35c74df92d35acc3144d", + "h1:kv4rW+6dyoJHxbZswm0vC4+e96D7NlzGo/sa6Psr4hU=", + "zh:0a209382e7644ceb6d0c871109cb730e772ac436f63a5c5814d12a476cc72986", + "zh:38efbb97d1aa2ae056fd9f8189a4773e29140af4a2a6d42fa37ae67a549c7649", + "zh:59bc24ff24197fd1bf428aa6ac213ea07ddea9ca33f71c3916578c7983e834c6", + "zh:66685d0635de949de8d9d685ea46c8714e06833cb2817e06284e278ecbad29cd", + "zh:71bbd37e880007c0bc3838dbb58847a7b6470c12d2278f91095c735760df0138", + "zh:7f74a806b384682e9f8d359b03e61904a45c4e618207edc31aeae2430daa21d6", + "zh:8114e395890a44973e08d134b057014c493a70087bd7e757fa6a680e5109f4a1", + "zh:8b4fd50aea90cda18519ba260f295afa4d55bdd951daca4c4bffb10e7920796f", + "zh:9783df35130f247ce8e58fc9ec601aeabd4cce065c382795e10a6503c7b42053", + "zh:d7c1323e48d323eef73ad1c84dcb5fbdfa4a79953337582e4f995dab73bf69df", + "zh:d938c14524d6c868c5a5803dcd572a0beb38f39059685f3222b9a465c08eda2d", + "zh:e8dfdf179c442cfe00c2981d0d997488eb9ca207226f9549e9bd3a258e783d2e", + "zh:f756a5fe204792ca10b0d2416491741b4199324bd6019706a65abfce78a4fcc7", + "zh:f9341da542f8dcd5c3ac1011fb937df596a0176f594dc0cb93a424fbcabb2ae2", ] } diff --git a/terragrunt/modules/crates-io/_terraform.tf b/terragrunt/modules/crates-io/_terraform.tf index 9556a9c54..e015bebde 100644 --- a/terragrunt/modules/crates-io/_terraform.tf +++ b/terragrunt/modules/crates-io/_terraform.tf @@ -7,7 +7,7 @@ terraform { } fastly = { source = "fastly/fastly" - version = "5.0.0" + version = "5.11.0" } } } diff --git a/terragrunt/modules/datadog-fastly/_terraform.tf b/terragrunt/modules/datadog-fastly/_terraform.tf index 4537d7b4b..008b99392 100644 --- a/terragrunt/modules/datadog-fastly/_terraform.tf +++ b/terragrunt/modules/datadog-fastly/_terraform.tf @@ -12,7 +12,7 @@ terraform { } fastly = { source = "fastly/fastly" - version = "5.2.2" + version = "5.11.0" } } } diff --git a/terragrunt/modules/fastly-tls-subscription/_terraform.tf b/terragrunt/modules/fastly-tls-subscription/_terraform.tf index 6fce00f51..fd5133cd2 100644 --- a/terragrunt/modules/fastly-tls-subscription/_terraform.tf +++ b/terragrunt/modules/fastly-tls-subscription/_terraform.tf @@ -8,8 +8,7 @@ terraform { } fastly = { source = "fastly/fastly" - version = "5.0.0" + version = "5.11.0" } } } - diff --git a/terragrunt/modules/release-distribution/_terraform.tf b/terragrunt/modules/release-distribution/_terraform.tf index fa4e2f073..f135e837d 100644 --- a/terragrunt/modules/release-distribution/_terraform.tf +++ b/terragrunt/modules/release-distribution/_terraform.tf @@ -8,7 +8,7 @@ terraform { } fastly = { source = "fastly/fastly" - version = "5.0.0" + version = "5.11.0" } } } From f3ecc2aed28820a99bc3140e5c4b234a9ecdda20 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 19 Aug 2024 11:48:47 +0200 Subject: [PATCH 16/21] update deployed ref --- .../crates-io/.terraform.lock.hcl | 34 +++++++++---------- .../legacy/crates-io-prod/deployed-ref | 2 +- .../legacy/releases-prod/deployed-ref | 2 +- .../release-distribution/.terraform.lock.hcl | 34 +++++++++---------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/terragrunt/accounts/legacy/crates-io-prod/crates-io/.terraform.lock.hcl b/terragrunt/accounts/legacy/crates-io-prod/crates-io/.terraform.lock.hcl index f803a14ae..592e9595c 100644 --- a/terragrunt/accounts/legacy/crates-io-prod/crates-io/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/crates-io-prod/crates-io/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/fastly/fastly" { - version = "5.0.0" - constraints = "5.0.0" + version = "5.11.0" + constraints = "5.11.0" hashes = [ - "h1:Q7RTj5hwsrfvuRxVrvc2opR2I85pZ+KqC6vUhnEfTE8=", - "zh:22e09df92cf4fc6880afff94c092bd7ab1f93fb2c5ae2b75414494de033c85b9", - "zh:251e7ec86eb5f1cb91bdfc2fe581eb048ca8d2df41f701407f6f072a268a8fa3", - "zh:27471e592e5210e0e682d29b024314fc45c9ec43631d0212760dc6e2afc84046", - "zh:32e25f5c509ffcb07ed6f7249f90b9211a0b3ac8b18268526961228d4f652852", - "zh:6c566bd62c6d8014f5f8af293c0071db8481b6e259e4d0b556d2ddb538257cb4", - "zh:912387ab7a7878d7cc718e73fbbb0d64ebd8dfb784bcb07b40dacb3f431c1a39", - "zh:a3eaf12f92c333c2d41d6dd95dbae24a4fa9aa198fb4bc42a50aa9925231c7ec", - "zh:bdd4fddd3c604ea1a0c0aac9952e2a3e236894d044e53ddca72e57c9f4ab7f33", - "zh:bf49558dcc9d1d4f9affa32dc62f631949d3d626e77b3c53200114a87e1ce9a3", - "zh:c552a2c920e26f8b53b8a2786531385f6c057deba3c22c5cd1041acf857a3ccb", - "zh:c8dae06397e415adc60573cd953789a98253657910846b90c87fa9db8fd672ff", - "zh:de2f71e246971663a5af7cac26385a8ab87b2ec837072fd060749bb32d7f21a2", - "zh:e2b8cd933535997a75da8e0eb4886b2afbad73d104f0a62ce622fa27d722b0f2", - "zh:fc699bdd98aec84ddac8121f5b58028de28685f0426b35c74df92d35acc3144d", + "h1:kv4rW+6dyoJHxbZswm0vC4+e96D7NlzGo/sa6Psr4hU=", + "zh:0a209382e7644ceb6d0c871109cb730e772ac436f63a5c5814d12a476cc72986", + "zh:38efbb97d1aa2ae056fd9f8189a4773e29140af4a2a6d42fa37ae67a549c7649", + "zh:59bc24ff24197fd1bf428aa6ac213ea07ddea9ca33f71c3916578c7983e834c6", + "zh:66685d0635de949de8d9d685ea46c8714e06833cb2817e06284e278ecbad29cd", + "zh:71bbd37e880007c0bc3838dbb58847a7b6470c12d2278f91095c735760df0138", + "zh:7f74a806b384682e9f8d359b03e61904a45c4e618207edc31aeae2430daa21d6", + "zh:8114e395890a44973e08d134b057014c493a70087bd7e757fa6a680e5109f4a1", + "zh:8b4fd50aea90cda18519ba260f295afa4d55bdd951daca4c4bffb10e7920796f", + "zh:9783df35130f247ce8e58fc9ec601aeabd4cce065c382795e10a6503c7b42053", + "zh:d7c1323e48d323eef73ad1c84dcb5fbdfa4a79953337582e4f995dab73bf69df", + "zh:d938c14524d6c868c5a5803dcd572a0beb38f39059685f3222b9a465c08eda2d", + "zh:e8dfdf179c442cfe00c2981d0d997488eb9ca207226f9549e9bd3a258e783d2e", + "zh:f756a5fe204792ca10b0d2416491741b4199324bd6019706a65abfce78a4fcc7", + "zh:f9341da542f8dcd5c3ac1011fb937df596a0176f594dc0cb93a424fbcabb2ae2", ] } diff --git a/terragrunt/accounts/legacy/crates-io-prod/deployed-ref b/terragrunt/accounts/legacy/crates-io-prod/deployed-ref index c030f3e3b..5e2e5211e 100644 --- a/terragrunt/accounts/legacy/crates-io-prod/deployed-ref +++ b/terragrunt/accounts/legacy/crates-io-prod/deployed-ref @@ -1 +1 @@ -f6b400a403563fd233dcaa58cc63c05c6fd40550 +585e9aabc4a5387af5c7aaebd68b095c1fcf89af diff --git a/terragrunt/accounts/legacy/releases-prod/deployed-ref b/terragrunt/accounts/legacy/releases-prod/deployed-ref index 68b4be267..5e2e5211e 100644 --- a/terragrunt/accounts/legacy/releases-prod/deployed-ref +++ b/terragrunt/accounts/legacy/releases-prod/deployed-ref @@ -1 +1 @@ -dd4723e1372b10b0f02f44b92c7427ba6f3408ab +585e9aabc4a5387af5c7aaebd68b095c1fcf89af diff --git a/terragrunt/accounts/legacy/releases-prod/release-distribution/.terraform.lock.hcl b/terragrunt/accounts/legacy/releases-prod/release-distribution/.terraform.lock.hcl index 7fe9385df..a9124f41e 100644 --- a/terragrunt/accounts/legacy/releases-prod/release-distribution/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/releases-prod/release-distribution/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/fastly/fastly" { - version = "5.0.0" - constraints = "5.0.0" + version = "5.11.0" + constraints = "5.11.0" hashes = [ - "h1:Q7RTj5hwsrfvuRxVrvc2opR2I85pZ+KqC6vUhnEfTE8=", - "zh:22e09df92cf4fc6880afff94c092bd7ab1f93fb2c5ae2b75414494de033c85b9", - "zh:251e7ec86eb5f1cb91bdfc2fe581eb048ca8d2df41f701407f6f072a268a8fa3", - "zh:27471e592e5210e0e682d29b024314fc45c9ec43631d0212760dc6e2afc84046", - "zh:32e25f5c509ffcb07ed6f7249f90b9211a0b3ac8b18268526961228d4f652852", - "zh:6c566bd62c6d8014f5f8af293c0071db8481b6e259e4d0b556d2ddb538257cb4", - "zh:912387ab7a7878d7cc718e73fbbb0d64ebd8dfb784bcb07b40dacb3f431c1a39", - "zh:a3eaf12f92c333c2d41d6dd95dbae24a4fa9aa198fb4bc42a50aa9925231c7ec", - "zh:bdd4fddd3c604ea1a0c0aac9952e2a3e236894d044e53ddca72e57c9f4ab7f33", - "zh:bf49558dcc9d1d4f9affa32dc62f631949d3d626e77b3c53200114a87e1ce9a3", - "zh:c552a2c920e26f8b53b8a2786531385f6c057deba3c22c5cd1041acf857a3ccb", - "zh:c8dae06397e415adc60573cd953789a98253657910846b90c87fa9db8fd672ff", - "zh:de2f71e246971663a5af7cac26385a8ab87b2ec837072fd060749bb32d7f21a2", - "zh:e2b8cd933535997a75da8e0eb4886b2afbad73d104f0a62ce622fa27d722b0f2", - "zh:fc699bdd98aec84ddac8121f5b58028de28685f0426b35c74df92d35acc3144d", + "h1:kv4rW+6dyoJHxbZswm0vC4+e96D7NlzGo/sa6Psr4hU=", + "zh:0a209382e7644ceb6d0c871109cb730e772ac436f63a5c5814d12a476cc72986", + "zh:38efbb97d1aa2ae056fd9f8189a4773e29140af4a2a6d42fa37ae67a549c7649", + "zh:59bc24ff24197fd1bf428aa6ac213ea07ddea9ca33f71c3916578c7983e834c6", + "zh:66685d0635de949de8d9d685ea46c8714e06833cb2817e06284e278ecbad29cd", + "zh:71bbd37e880007c0bc3838dbb58847a7b6470c12d2278f91095c735760df0138", + "zh:7f74a806b384682e9f8d359b03e61904a45c4e618207edc31aeae2430daa21d6", + "zh:8114e395890a44973e08d134b057014c493a70087bd7e757fa6a680e5109f4a1", + "zh:8b4fd50aea90cda18519ba260f295afa4d55bdd951daca4c4bffb10e7920796f", + "zh:9783df35130f247ce8e58fc9ec601aeabd4cce065c382795e10a6503c7b42053", + "zh:d7c1323e48d323eef73ad1c84dcb5fbdfa4a79953337582e4f995dab73bf69df", + "zh:d938c14524d6c868c5a5803dcd572a0beb38f39059685f3222b9a465c08eda2d", + "zh:e8dfdf179c442cfe00c2981d0d997488eb9ca207226f9549e9bd3a258e783d2e", + "zh:f756a5fe204792ca10b0d2416491741b4199324bd6019706a65abfce78a4fcc7", + "zh:f9341da542f8dcd5c3ac1011fb937df596a0176f594dc0cb93a424fbcabb2ae2", ] } From 80bdd3154f0f8d5b079b640bd7e850c28c81b18e Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:17:25 +0200 Subject: [PATCH 17/21] update --- .../.terraform.lock.hcl | 67 ++++++++++--------- .../crates-io-heroku-metrics/_terraform.tf | 2 +- terraform/docs-rs/.terraform.lock.hcl | 36 +++++----- terraform/rustc-ci/.terraform.lock.hcl | 35 +++++----- terraform/team-repo/.terraform.lock.hcl | 35 +++++----- .../docs-rs/.terraform.lock.hcl | 37 +++++----- 6 files changed, 107 insertions(+), 105 deletions(-) diff --git a/terraform/crates-io-heroku-metrics/.terraform.lock.hcl b/terraform/crates-io-heroku-metrics/.terraform.lock.hcl index 1ed8bc5be..05bfd5ec0 100644 --- a/terraform/crates-io-heroku-metrics/.terraform.lock.hcl +++ b/terraform/crates-io-heroku-metrics/.terraform.lock.hcl @@ -2,46 +2,47 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.45.0" + version = "4.67.0" constraints = "~> 4.20" hashes = [ - "h1:J/XjRsEJIpxi+mczXQfnH3nvfACv3LRDtrthQJCIibY=", - "zh:22da03786f25658a000d1bcc28c780816a97e7e8a1f59fff6eee7d452830e95e", - "zh:2543be56eee0491eb0c79ca1c901dcbf71da26625961fe719f088263fef062f4", - "zh:31a1da1e3beedfd88c3c152ab505bdcf330427f26b75835885526f7bb75c4857", - "zh:4409afe50f225659d5f378fe9303a45052953a1219f7f1acc82b69d07528b7ba", - "zh:4dadec3b783f10d2f8eef3dab5e817baae9c932a7967d45fe3d77fcbcbdaa438", - "zh:55be80d6e24828dcb0db7a0226fb275415c1c0ad63dd2f33b76f3ac0cd64e6a6", - "zh:560bba29efb7dbe0bfcc937369d88817aa31a8d18aa25395b1afe2576cb04495", - "zh:6caacc202e83438ff63d5d96733e283f44e349668d96c6b1c5c7df463ebf85cc", - "zh:6cabab83a61d5b4ac801c5a5d57556a0e76ec8dc879d28cf777509db5f6a657e", - "zh:96c4528bf9c16edb8841b68479ec51c499ed7fa680462fa28caeab3fc168bb43", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:cdc0b47ff840d708fbf75abfe86d23dc7f1dffdd233a771822a17b5c637f4769", - "zh:d9a9583e82776d1ebb6cf6c3d47acc2b302f8778f470ceffe7579dc794eb1feb", - "zh:e9367ca9f6f6418a23cdf8d01f29dd0c4f614e78499f52a767a422e4c334b915", - "zh:f6d355a2fb3bcebb597f68bbca4fa2aaa364efd29240236c582375e219d77656", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } provider "registry.terraform.io/integrations/github" { - version = "4.31.0" - constraints = "~> 4.0, ~> 4.14" + version = "6.2.3" + constraints = "~> 6.2.3" hashes = [ - "h1:nO3MyFnQToKUSIImFS2ib7RAMOy02Me6Up4qGBvdKMw=", - "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", - "zh:0dca3802a7ea1ba4812c866bf202e62aef6c8995db8856fdb5b4d1d81b505518", - "zh:24e6a56b34b3e0dca6ca0d6f22d0a31dda6a3256713492902c39ce9edd14acbd", - "zh:42e41fa4e61218973615b7e5d564119bb5c728ee40b881539964cd704632d8c0", - "zh:6aa6bb04fdc00c3c762122e96ee7c19abfb8e42dc5d3a720b5767dbb4cfa274d", - "zh:74ea4bbad825eee831d37940760459786460fe492e1b30acb5c91c9edd14a5ea", - "zh:8e170f6d5e46c08fbc3b5ff251075382f75b53a66a83b7b005099fb99ad94f24", - "zh:9164b611e7318e3d08cc84513d3d8c27bd12336a7721a894cb3d346b60286233", - "zh:91d3397f021c5a9fedff36f84635ffc3169224494629bb4a578356a05091e182", - "zh:b061e1529499bf40f8f14c9c8116787dd50f6fd3d64ad38d77cd39db77e98ae9", - "zh:c9daff626f7a55c01db79b6ccc462948bf854d976c73def306ae9ae09e5afe1b", - "zh:ec7e223ae7d6292b8425b7190e801f1098a647d2aee3132761d37fd75cfcfe07", - "zh:f2001b2a2f7049fc74ffe54d7bc48c9dfec80956f468a2c8a550c5071d077dbd", - "zh:f75ec1e71924c50b346bced15883c626f697ffd3ee6c4bb2835e4170fe65215a", + "h1:qBH3fN/NItflQkBoIVdQa7n8WvBOuu7Ao20oeoAubKM=", + "zh:05874671652a260b12d784cc46b0eea156f493a5f12e00368d1f6cb319156257", + "zh:0c7a3cae5a66e5c5efc3b25ba646a0d46bfe1fd3edba1f5a75f51aede85a9d1b", + "zh:174310010d08f13e36e53ff18e44a21dd040c89884ef190a192c6ce27926a912", + "zh:23d1d8731e518354ce6a83419f49101aece63882b0ca7c489f3c598cc6ea5d5e", + "zh:4e88953816daf11ab1681c32c7988d4e29476fc44f0959fe03173532cf5044de", + "zh:6fab07734ccf27f5afee4442abae2d33245eabf35519032ce1e2aad6961a640a", + "zh:7b2f324b918e161c892c29ee80d36c48ca8b891b8047e132fc701ca741e5ae72", + "zh:8ef4f0d691ade98082ef1f6b36e556468e5ab26e60021f0de0fb22e3acdfd990", + "zh:8f0f3e139faa8f2b9075bb9978dd683f4bab5ac91171bbb969addd04d7f0b90f", + "zh:97cb6d7fdf640237cc2f0ab830db8f878770968c59fd28298e9dddb8b9e6294d", + "zh:a17038d8747c6bb660e4c5981e8ffbbc33c66ba164868fd35d442e7f828a1e01", + "zh:aa9f4b7d947f7b11277b4e9ba7147f5594cf60a6589b7aac4344f73d1400d1c0", + "zh:c780b951e14d583ef6ffef9a934831b56ee157c50ed8e969c676a636810f7db1", + "zh:d8497bb2986fd76107b7208b33cc39281797164fdea09453e987b969a461befb", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } diff --git a/terraform/crates-io-heroku-metrics/_terraform.tf b/terraform/crates-io-heroku-metrics/_terraform.tf index 86a6987c3..f4d46333a 100644 --- a/terraform/crates-io-heroku-metrics/_terraform.tf +++ b/terraform/crates-io-heroku-metrics/_terraform.tf @@ -10,7 +10,7 @@ terraform { } github = { source = "integrations/github" - version = "~> 4.14" + version = "~> 6.2.3" } } diff --git a/terraform/docs-rs/.terraform.lock.hcl b/terraform/docs-rs/.terraform.lock.hcl index 501211c86..759283e56 100644 --- a/terraform/docs-rs/.terraform.lock.hcl +++ b/terraform/docs-rs/.terraform.lock.hcl @@ -45,24 +45,24 @@ provider "registry.terraform.io/hashicorp/random" { } provider "registry.terraform.io/integrations/github" { - version = "4.31.0" - constraints = "~> 4.0" + version = "6.2.3" + constraints = "~> 6.2.3" hashes = [ - "h1:FkBft5JlVtlcYcEM0CiphlFWgjBFQVziJMwrowuBIoc=", - "h1:nO3MyFnQToKUSIImFS2ib7RAMOy02Me6Up4qGBvdKMw=", - "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", - "zh:0dca3802a7ea1ba4812c866bf202e62aef6c8995db8856fdb5b4d1d81b505518", - "zh:24e6a56b34b3e0dca6ca0d6f22d0a31dda6a3256713492902c39ce9edd14acbd", - "zh:42e41fa4e61218973615b7e5d564119bb5c728ee40b881539964cd704632d8c0", - "zh:6aa6bb04fdc00c3c762122e96ee7c19abfb8e42dc5d3a720b5767dbb4cfa274d", - "zh:74ea4bbad825eee831d37940760459786460fe492e1b30acb5c91c9edd14a5ea", - "zh:8e170f6d5e46c08fbc3b5ff251075382f75b53a66a83b7b005099fb99ad94f24", - "zh:9164b611e7318e3d08cc84513d3d8c27bd12336a7721a894cb3d346b60286233", - "zh:91d3397f021c5a9fedff36f84635ffc3169224494629bb4a578356a05091e182", - "zh:b061e1529499bf40f8f14c9c8116787dd50f6fd3d64ad38d77cd39db77e98ae9", - "zh:c9daff626f7a55c01db79b6ccc462948bf854d976c73def306ae9ae09e5afe1b", - "zh:ec7e223ae7d6292b8425b7190e801f1098a647d2aee3132761d37fd75cfcfe07", - "zh:f2001b2a2f7049fc74ffe54d7bc48c9dfec80956f468a2c8a550c5071d077dbd", - "zh:f75ec1e71924c50b346bced15883c626f697ffd3ee6c4bb2835e4170fe65215a", + "h1:qBH3fN/NItflQkBoIVdQa7n8WvBOuu7Ao20oeoAubKM=", + "zh:05874671652a260b12d784cc46b0eea156f493a5f12e00368d1f6cb319156257", + "zh:0c7a3cae5a66e5c5efc3b25ba646a0d46bfe1fd3edba1f5a75f51aede85a9d1b", + "zh:174310010d08f13e36e53ff18e44a21dd040c89884ef190a192c6ce27926a912", + "zh:23d1d8731e518354ce6a83419f49101aece63882b0ca7c489f3c598cc6ea5d5e", + "zh:4e88953816daf11ab1681c32c7988d4e29476fc44f0959fe03173532cf5044de", + "zh:6fab07734ccf27f5afee4442abae2d33245eabf35519032ce1e2aad6961a640a", + "zh:7b2f324b918e161c892c29ee80d36c48ca8b891b8047e132fc701ca741e5ae72", + "zh:8ef4f0d691ade98082ef1f6b36e556468e5ab26e60021f0de0fb22e3acdfd990", + "zh:8f0f3e139faa8f2b9075bb9978dd683f4bab5ac91171bbb969addd04d7f0b90f", + "zh:97cb6d7fdf640237cc2f0ab830db8f878770968c59fd28298e9dddb8b9e6294d", + "zh:a17038d8747c6bb660e4c5981e8ffbbc33c66ba164868fd35d442e7f828a1e01", + "zh:aa9f4b7d947f7b11277b4e9ba7147f5594cf60a6589b7aac4344f73d1400d1c0", + "zh:c780b951e14d583ef6ffef9a934831b56ee157c50ed8e969c676a636810f7db1", + "zh:d8497bb2986fd76107b7208b33cc39281797164fdea09453e987b969a461befb", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } diff --git a/terraform/rustc-ci/.terraform.lock.hcl b/terraform/rustc-ci/.terraform.lock.hcl index 5144f0431..ca7e6e62d 100644 --- a/terraform/rustc-ci/.terraform.lock.hcl +++ b/terraform/rustc-ci/.terraform.lock.hcl @@ -25,23 +25,24 @@ provider "registry.terraform.io/hashicorp/aws" { } provider "registry.terraform.io/integrations/github" { - version = "4.31.0" - constraints = "~> 4.0" + version = "6.2.3" + constraints = "~> 6.2.3" hashes = [ - "h1:FkBft5JlVtlcYcEM0CiphlFWgjBFQVziJMwrowuBIoc=", - "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", - "zh:0dca3802a7ea1ba4812c866bf202e62aef6c8995db8856fdb5b4d1d81b505518", - "zh:24e6a56b34b3e0dca6ca0d6f22d0a31dda6a3256713492902c39ce9edd14acbd", - "zh:42e41fa4e61218973615b7e5d564119bb5c728ee40b881539964cd704632d8c0", - "zh:6aa6bb04fdc00c3c762122e96ee7c19abfb8e42dc5d3a720b5767dbb4cfa274d", - "zh:74ea4bbad825eee831d37940760459786460fe492e1b30acb5c91c9edd14a5ea", - "zh:8e170f6d5e46c08fbc3b5ff251075382f75b53a66a83b7b005099fb99ad94f24", - "zh:9164b611e7318e3d08cc84513d3d8c27bd12336a7721a894cb3d346b60286233", - "zh:91d3397f021c5a9fedff36f84635ffc3169224494629bb4a578356a05091e182", - "zh:b061e1529499bf40f8f14c9c8116787dd50f6fd3d64ad38d77cd39db77e98ae9", - "zh:c9daff626f7a55c01db79b6ccc462948bf854d976c73def306ae9ae09e5afe1b", - "zh:ec7e223ae7d6292b8425b7190e801f1098a647d2aee3132761d37fd75cfcfe07", - "zh:f2001b2a2f7049fc74ffe54d7bc48c9dfec80956f468a2c8a550c5071d077dbd", - "zh:f75ec1e71924c50b346bced15883c626f697ffd3ee6c4bb2835e4170fe65215a", + "h1:qBH3fN/NItflQkBoIVdQa7n8WvBOuu7Ao20oeoAubKM=", + "zh:05874671652a260b12d784cc46b0eea156f493a5f12e00368d1f6cb319156257", + "zh:0c7a3cae5a66e5c5efc3b25ba646a0d46bfe1fd3edba1f5a75f51aede85a9d1b", + "zh:174310010d08f13e36e53ff18e44a21dd040c89884ef190a192c6ce27926a912", + "zh:23d1d8731e518354ce6a83419f49101aece63882b0ca7c489f3c598cc6ea5d5e", + "zh:4e88953816daf11ab1681c32c7988d4e29476fc44f0959fe03173532cf5044de", + "zh:6fab07734ccf27f5afee4442abae2d33245eabf35519032ce1e2aad6961a640a", + "zh:7b2f324b918e161c892c29ee80d36c48ca8b891b8047e132fc701ca741e5ae72", + "zh:8ef4f0d691ade98082ef1f6b36e556468e5ab26e60021f0de0fb22e3acdfd990", + "zh:8f0f3e139faa8f2b9075bb9978dd683f4bab5ac91171bbb969addd04d7f0b90f", + "zh:97cb6d7fdf640237cc2f0ab830db8f878770968c59fd28298e9dddb8b9e6294d", + "zh:a17038d8747c6bb660e4c5981e8ffbbc33c66ba164868fd35d442e7f828a1e01", + "zh:aa9f4b7d947f7b11277b4e9ba7147f5594cf60a6589b7aac4344f73d1400d1c0", + "zh:c780b951e14d583ef6ffef9a934831b56ee157c50ed8e969c676a636810f7db1", + "zh:d8497bb2986fd76107b7208b33cc39281797164fdea09453e987b969a461befb", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } diff --git a/terraform/team-repo/.terraform.lock.hcl b/terraform/team-repo/.terraform.lock.hcl index 48a277a8b..e5e6f693c 100644 --- a/terraform/team-repo/.terraform.lock.hcl +++ b/terraform/team-repo/.terraform.lock.hcl @@ -45,23 +45,24 @@ provider "registry.terraform.io/hashicorp/external" { } provider "registry.terraform.io/integrations/github" { - version = "4.31.0" - constraints = "~> 4.14" + version = "6.2.3" + constraints = "~> 6.2.3" hashes = [ - "h1:FkBft5JlVtlcYcEM0CiphlFWgjBFQVziJMwrowuBIoc=", - "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", - "zh:0dca3802a7ea1ba4812c866bf202e62aef6c8995db8856fdb5b4d1d81b505518", - "zh:24e6a56b34b3e0dca6ca0d6f22d0a31dda6a3256713492902c39ce9edd14acbd", - "zh:42e41fa4e61218973615b7e5d564119bb5c728ee40b881539964cd704632d8c0", - "zh:6aa6bb04fdc00c3c762122e96ee7c19abfb8e42dc5d3a720b5767dbb4cfa274d", - "zh:74ea4bbad825eee831d37940760459786460fe492e1b30acb5c91c9edd14a5ea", - "zh:8e170f6d5e46c08fbc3b5ff251075382f75b53a66a83b7b005099fb99ad94f24", - "zh:9164b611e7318e3d08cc84513d3d8c27bd12336a7721a894cb3d346b60286233", - "zh:91d3397f021c5a9fedff36f84635ffc3169224494629bb4a578356a05091e182", - "zh:b061e1529499bf40f8f14c9c8116787dd50f6fd3d64ad38d77cd39db77e98ae9", - "zh:c9daff626f7a55c01db79b6ccc462948bf854d976c73def306ae9ae09e5afe1b", - "zh:ec7e223ae7d6292b8425b7190e801f1098a647d2aee3132761d37fd75cfcfe07", - "zh:f2001b2a2f7049fc74ffe54d7bc48c9dfec80956f468a2c8a550c5071d077dbd", - "zh:f75ec1e71924c50b346bced15883c626f697ffd3ee6c4bb2835e4170fe65215a", + "h1:qBH3fN/NItflQkBoIVdQa7n8WvBOuu7Ao20oeoAubKM=", + "zh:05874671652a260b12d784cc46b0eea156f493a5f12e00368d1f6cb319156257", + "zh:0c7a3cae5a66e5c5efc3b25ba646a0d46bfe1fd3edba1f5a75f51aede85a9d1b", + "zh:174310010d08f13e36e53ff18e44a21dd040c89884ef190a192c6ce27926a912", + "zh:23d1d8731e518354ce6a83419f49101aece63882b0ca7c489f3c598cc6ea5d5e", + "zh:4e88953816daf11ab1681c32c7988d4e29476fc44f0959fe03173532cf5044de", + "zh:6fab07734ccf27f5afee4442abae2d33245eabf35519032ce1e2aad6961a640a", + "zh:7b2f324b918e161c892c29ee80d36c48ca8b891b8047e132fc701ca741e5ae72", + "zh:8ef4f0d691ade98082ef1f6b36e556468e5ab26e60021f0de0fb22e3acdfd990", + "zh:8f0f3e139faa8f2b9075bb9978dd683f4bab5ac91171bbb969addd04d7f0b90f", + "zh:97cb6d7fdf640237cc2f0ab830db8f878770968c59fd28298e9dddb8b9e6294d", + "zh:a17038d8747c6bb660e4c5981e8ffbbc33c66ba164868fd35d442e7f828a1e01", + "zh:aa9f4b7d947f7b11277b4e9ba7147f5594cf60a6589b7aac4344f73d1400d1c0", + "zh:c780b951e14d583ef6ffef9a934831b56ee157c50ed8e969c676a636810f7db1", + "zh:d8497bb2986fd76107b7208b33cc39281797164fdea09453e987b969a461befb", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } diff --git a/terragrunt/accounts/docs-rs-staging/docs-rs/.terraform.lock.hcl b/terragrunt/accounts/docs-rs-staging/docs-rs/.terraform.lock.hcl index a885930c8..759283e56 100644 --- a/terragrunt/accounts/docs-rs-staging/docs-rs/.terraform.lock.hcl +++ b/terragrunt/accounts/docs-rs-staging/docs-rs/.terraform.lock.hcl @@ -45,25 +45,24 @@ provider "registry.terraform.io/hashicorp/random" { } provider "registry.terraform.io/integrations/github" { - version = "4.31.0" - constraints = "~> 4.0" + version = "6.2.3" + constraints = "~> 6.2.3" hashes = [ - "h1:FkBft5JlVtlcYcEM0CiphlFWgjBFQVziJMwrowuBIoc=", - "h1:fm77HQzGPdMeRGbu6xn/3CtQsHfHbaZdfIhIbgJj1kY=", - "h1:nO3MyFnQToKUSIImFS2ib7RAMOy02Me6Up4qGBvdKMw=", - "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", - "zh:0dca3802a7ea1ba4812c866bf202e62aef6c8995db8856fdb5b4d1d81b505518", - "zh:24e6a56b34b3e0dca6ca0d6f22d0a31dda6a3256713492902c39ce9edd14acbd", - "zh:42e41fa4e61218973615b7e5d564119bb5c728ee40b881539964cd704632d8c0", - "zh:6aa6bb04fdc00c3c762122e96ee7c19abfb8e42dc5d3a720b5767dbb4cfa274d", - "zh:74ea4bbad825eee831d37940760459786460fe492e1b30acb5c91c9edd14a5ea", - "zh:8e170f6d5e46c08fbc3b5ff251075382f75b53a66a83b7b005099fb99ad94f24", - "zh:9164b611e7318e3d08cc84513d3d8c27bd12336a7721a894cb3d346b60286233", - "zh:91d3397f021c5a9fedff36f84635ffc3169224494629bb4a578356a05091e182", - "zh:b061e1529499bf40f8f14c9c8116787dd50f6fd3d64ad38d77cd39db77e98ae9", - "zh:c9daff626f7a55c01db79b6ccc462948bf854d976c73def306ae9ae09e5afe1b", - "zh:ec7e223ae7d6292b8425b7190e801f1098a647d2aee3132761d37fd75cfcfe07", - "zh:f2001b2a2f7049fc74ffe54d7bc48c9dfec80956f468a2c8a550c5071d077dbd", - "zh:f75ec1e71924c50b346bced15883c626f697ffd3ee6c4bb2835e4170fe65215a", + "h1:qBH3fN/NItflQkBoIVdQa7n8WvBOuu7Ao20oeoAubKM=", + "zh:05874671652a260b12d784cc46b0eea156f493a5f12e00368d1f6cb319156257", + "zh:0c7a3cae5a66e5c5efc3b25ba646a0d46bfe1fd3edba1f5a75f51aede85a9d1b", + "zh:174310010d08f13e36e53ff18e44a21dd040c89884ef190a192c6ce27926a912", + "zh:23d1d8731e518354ce6a83419f49101aece63882b0ca7c489f3c598cc6ea5d5e", + "zh:4e88953816daf11ab1681c32c7988d4e29476fc44f0959fe03173532cf5044de", + "zh:6fab07734ccf27f5afee4442abae2d33245eabf35519032ce1e2aad6961a640a", + "zh:7b2f324b918e161c892c29ee80d36c48ca8b891b8047e132fc701ca741e5ae72", + "zh:8ef4f0d691ade98082ef1f6b36e556468e5ab26e60021f0de0fb22e3acdfd990", + "zh:8f0f3e139faa8f2b9075bb9978dd683f4bab5ac91171bbb969addd04d7f0b90f", + "zh:97cb6d7fdf640237cc2f0ab830db8f878770968c59fd28298e9dddb8b9e6294d", + "zh:a17038d8747c6bb660e4c5981e8ffbbc33c66ba164868fd35d442e7f828a1e01", + "zh:aa9f4b7d947f7b11277b4e9ba7147f5594cf60a6589b7aac4344f73d1400d1c0", + "zh:c780b951e14d583ef6ffef9a934831b56ee157c50ed8e969c676a636810f7db1", + "zh:d8497bb2986fd76107b7208b33cc39281797164fdea09453e987b969a461befb", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } From d5f0c0a5573b9596fb101be85ab630ff4e35ecd1 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:22:08 +0200 Subject: [PATCH 18/21] revert sync-team because it gives issues --- terragrunt/modules/sync-team/_terraform.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/modules/sync-team/_terraform.tf b/terragrunt/modules/sync-team/_terraform.tf index 2a432d8f9..710a01518 100644 --- a/terragrunt/modules/sync-team/_terraform.tf +++ b/terragrunt/modules/sync-team/_terraform.tf @@ -14,7 +14,7 @@ terraform { } github = { source = "integrations/github" - version = "~> 6.2.3" + version = "~> 4.14" } } } From e4dd87fafbd4ea0fdb6e75ef4be9b79485609c30 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:34:29 +0200 Subject: [PATCH 19/21] chore(terraform bors): update terraform providers --- terraform/bors/.terraform.lock.hcl | 114 +++++++++++++---------------- terraform/bors/_terraform.tf | 6 +- terraform/bors/app.tf | 2 + 3 files changed, 56 insertions(+), 66 deletions(-) diff --git a/terraform/bors/.terraform.lock.hcl b/terraform/bors/.terraform.lock.hcl index c284e33ad..d94444ccc 100644 --- a/terraform/bors/.terraform.lock.hcl +++ b/terraform/bors/.terraform.lock.hcl @@ -2,79 +2,67 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "3.59.0" - constraints = "~> 3.59" + version = "4.67.0" + constraints = "~> 4.20" hashes = [ - "h1:6JlihvRdEq02BzOZ7P7De2W5HH41ASVYg5I5Z2lAhIo=", - "zh:0b33154c805071af15839184f3faafeb1549d26a2f1fe721393461790c5ddb46", - "zh:1c5c6793cbec328394c6dda686298d9f6bb7b4c6a39e3dc48dc3035dea9aeda0", - "zh:20b590b9d9f0a18fdc9f0fb18bb2d9d5349b14039899ecf66e4ae5513606405b", - "zh:3e9010dbb0655b5d05e5e98bfe3e1e73cfa5ff6b364dfd73e8eeeb5e1e58c643", - "zh:47a46895d2592fbe7c904107ab6af25abbb17de230852859c06eee95ab282823", - "zh:615745b8c25b111cfe204d52553ea530d84abba7fb8be6b5b00476184407b556", - "zh:701e0f2e5191729601b6d7591e5c3f5d77439125a74116786cca3bc6d7abf0d9", - "zh:7217637b5726bfd09dc9b4f75aef643530e8b673f6de6e06f660a70f4d3170e2", - "zh:8097811557dd5fffcc77e921d3a49dfaa203d4640ac3859a64dcd927122ade8b", - "zh:9a23df54c62dcf74e88aa309700651a6e77e173429ef0307ee15aaa7ff2f47d0", - "zh:e5fa052b9285332a1ebb360ab14676bca88efdaac96cdd809207b23f8e732bb0", - ] -} - -provider "registry.terraform.io/hashicorp/github" { - version = "4.14.0" - hashes = [ - "h1:GIBd5BCbId37l9knEcP9k4NwOVrfJMToKkuSZ5kUEX0=", - "zh:1c675ce700c0ebfc7ef437443fb25f912a62717b7bca60071bf9733d23db9576", - "zh:242362cc1b4932b80333f3f9b4dab6edfc84fd4cb9811bad81872939cf088b5a", - "zh:25bc76d0e8cce0b8bcee45a88810d655e1253c9001533b087f57fd223dc4881c", - "zh:3bce5f98e087796866ade17cfaa8b3f70018b53e8cff3cae32dac0a910d060a8", - "zh:3dda969761bb60c1721dac6901450be08b2d7501eda21146ba9dc172fcc05723", - "zh:5bf6b85ce208a113b54d70b973f81e7c7a7ea9a3f6d2b30eaa41ea641333ab25", - "zh:81b75b38332affb15bc9004c8c6aa746595b0879f779c4886899aef3db434645", - "zh:8a2310d85ecd60c079ec2db14ed338296f83b77857ae68e48b1a7a8a946a260c", - "zh:a9f1d55cee031c883ead6420896225806fda239374d730ed2d7446bee3224564", - "zh:caa1cf690c4e208847b026071567a7ee8b2e55dbc75649e7de393b5502a2418b", - "zh:e4a077b84a01d3c50ab0de1eb70122912c340f89be995177fb4ab0635f11527e", - "zh:e9e40b34915e1cfae711218976f398e3dae5c96682516dab870fc97e8048f416", - "zh:fadf11408f16ddf1605419a357ac53cf2dde6cc769757eacc9ae804a21c8d71e", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.0.1" - constraints = "~> 3.0.0" + version = "3.6.2" + constraints = "~> 3.6.2" hashes = [ - "h1:SzM8nt2wzLMI28A3CWAtW25g3ZCm1O4xD0h3Ps/rU1U=", - "zh:0d4f683868324af056a9eb2b06306feef7c202c88dbbe6a4ad7517146a22fb50", - "zh:4824b3c7914b77d41dfe90f6f333c7ac9860afb83e2a344d91fbe46e5dfbec26", - "zh:4b82e43712f3cf0d0cbc95b2cbcd409ba8f0dc7848fdfb7c13633c27468ed04a", - "zh:78b3a2b860c3ebc973a794000015f5946eb59b82705d701d487475406b2612f1", - "zh:88bc65197bd74ff408d147b32f0045372ae3a3f2a2fdd7f734f315d988c0e4a2", - "zh:91bd3c9f625f177f3a5d641a64e54d4b4540cb071070ecda060a8261fb6eb2ef", - "zh:a6818842b28d800f784e0c93284ff602b0c4022f407e4750da03f50b853a9a2c", - "zh:c4a1a2b52abd05687e6cfded4a789dcd7b43e7a746e4d02dd1055370cf9a994d", - "zh:cf65041bf12fc3bde709c1d267dbe94142bc05adcabc4feb17da3b12249132ac", - "zh:e385e00e7425dda9d30b74ab4ffa4636f4b8eb23918c0b763f0ffab84ece0c5c", + "h1:VavG5unYCa3SYISMKF9pzc3718M0bhPlcbUZZGl7wuo=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", ] } provider "registry.terraform.io/integrations/github" { - version = "4.14.0" - constraints = "~> 4.14" + version = "6.2.3" + constraints = "~> 6.2.3" hashes = [ - "h1:GIBd5BCbId37l9knEcP9k4NwOVrfJMToKkuSZ5kUEX0=", - "zh:1c675ce700c0ebfc7ef437443fb25f912a62717b7bca60071bf9733d23db9576", - "zh:242362cc1b4932b80333f3f9b4dab6edfc84fd4cb9811bad81872939cf088b5a", - "zh:25bc76d0e8cce0b8bcee45a88810d655e1253c9001533b087f57fd223dc4881c", - "zh:3bce5f98e087796866ade17cfaa8b3f70018b53e8cff3cae32dac0a910d060a8", - "zh:3dda969761bb60c1721dac6901450be08b2d7501eda21146ba9dc172fcc05723", - "zh:5bf6b85ce208a113b54d70b973f81e7c7a7ea9a3f6d2b30eaa41ea641333ab25", - "zh:81b75b38332affb15bc9004c8c6aa746595b0879f779c4886899aef3db434645", - "zh:8a2310d85ecd60c079ec2db14ed338296f83b77857ae68e48b1a7a8a946a260c", - "zh:a9f1d55cee031c883ead6420896225806fda239374d730ed2d7446bee3224564", - "zh:caa1cf690c4e208847b026071567a7ee8b2e55dbc75649e7de393b5502a2418b", - "zh:e4a077b84a01d3c50ab0de1eb70122912c340f89be995177fb4ab0635f11527e", - "zh:e9e40b34915e1cfae711218976f398e3dae5c96682516dab870fc97e8048f416", - "zh:fadf11408f16ddf1605419a357ac53cf2dde6cc769757eacc9ae804a21c8d71e", + "h1:qBH3fN/NItflQkBoIVdQa7n8WvBOuu7Ao20oeoAubKM=", + "zh:05874671652a260b12d784cc46b0eea156f493a5f12e00368d1f6cb319156257", + "zh:0c7a3cae5a66e5c5efc3b25ba646a0d46bfe1fd3edba1f5a75f51aede85a9d1b", + "zh:174310010d08f13e36e53ff18e44a21dd040c89884ef190a192c6ce27926a912", + "zh:23d1d8731e518354ce6a83419f49101aece63882b0ca7c489f3c598cc6ea5d5e", + "zh:4e88953816daf11ab1681c32c7988d4e29476fc44f0959fe03173532cf5044de", + "zh:6fab07734ccf27f5afee4442abae2d33245eabf35519032ce1e2aad6961a640a", + "zh:7b2f324b918e161c892c29ee80d36c48ca8b891b8047e132fc701ca741e5ae72", + "zh:8ef4f0d691ade98082ef1f6b36e556468e5ab26e60021f0de0fb22e3acdfd990", + "zh:8f0f3e139faa8f2b9075bb9978dd683f4bab5ac91171bbb969addd04d7f0b90f", + "zh:97cb6d7fdf640237cc2f0ab830db8f878770968c59fd28298e9dddb8b9e6294d", + "zh:a17038d8747c6bb660e4c5981e8ffbbc33c66ba164868fd35d442e7f828a1e01", + "zh:aa9f4b7d947f7b11277b4e9ba7147f5594cf60a6589b7aac4344f73d1400d1c0", + "zh:c780b951e14d583ef6ffef9a934831b56ee157c50ed8e969c676a636810f7db1", + "zh:d8497bb2986fd76107b7208b33cc39281797164fdea09453e987b969a461befb", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } diff --git a/terraform/bors/_terraform.tf b/terraform/bors/_terraform.tf index 92a19642c..24a46889e 100644 --- a/terraform/bors/_terraform.tf +++ b/terraform/bors/_terraform.tf @@ -6,15 +6,15 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 3.59" + version = "~> 4.20" } github = { source = "integrations/github" - version = "~> 4.14" + version = "~> 6.2.3" } random = { source = "hashicorp/random" - version = "~> 3.0.0" + version = "~> 3.6.2" } } diff --git a/terraform/bors/app.tf b/terraform/bors/app.tf index e27ab6329..6d904e383 100644 --- a/terraform/bors/app.tf +++ b/terraform/bors/app.tf @@ -30,6 +30,8 @@ module "bors" { container_port = 80 domains = concat([var.domain_name], var.legacy_domain_names) + prometheus = null + health_check_path = "/health" health_check_interval = 60 health_check_timeout = 50 From fe7f3b92fbe04cd9d36bf36992f653ce27c7e8c7 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:51:00 +0200 Subject: [PATCH 20/21] feat: serve version downloads index.html --- .../cloudfront-functions/static-router.js | 16 ++++++++++ .../crates-io/compute-static/src/main.rs | 31 ++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/terragrunt/modules/crates-io/cloudfront-functions/static-router.js b/terragrunt/modules/crates-io/cloudfront-functions/static-router.js index 60ffb46da..98419d5e0 100644 --- a/terragrunt/modules/crates-io/cloudfront-functions/static-router.js +++ b/terragrunt/modules/crates-io/cloudfront-functions/static-router.js @@ -1,10 +1,16 @@ function handler(event) { var request = event.request; + var versionDownloads ='/archive/version-downloads/'; // URL-encode the `+` character in the request URI // See more: https://github.com/rust-lang/crates.io/issues/4891 if (request.uri.includes("+")) { request.uri = request.uri.replace("+", "%2B"); + } else if (request.uri === versionDownloads) { + request.uri += 'index.html'; + return request; + } else if (request.uri === '/archive/version-downloads') { + return permanentRedirect(versionDownloads); } // cargo versions before 1.24 don't support placeholders in the `dl` field @@ -19,3 +25,13 @@ function handler(event) { return request; } + +function permanentRedirect(destination) { + return { + statusCode: 301, + statusDescription: 'Moved Permanently', + headers: { + 'location': { value: destination }, + }, + }; +} diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs index 3753f7e17..ba2c90907 100644 --- a/terragrunt/modules/crates-io/compute-static/src/main.rs +++ b/terragrunt/modules/crates-io/compute-static/src/main.rs @@ -1,4 +1,5 @@ -use fastly::http::{Method, StatusCode, Version}; +use fastly::convert::ToHeaderValue; +use fastly::http::{header, Method, StatusCode, Version}; use fastly::{Error, Request, Response}; use log::{info, warn, LevelFilter}; use log_fastly::Logger; @@ -16,6 +17,7 @@ mod log_line; const DATADOG_APP: &str = "crates.io"; const DATADOG_SERVICE: &str = "static.crates.io"; +const VERSION_DOWNLOADS: &str = "/archive/version-downloads/"; #[fastly::main] fn main(request: Request) -> Result { @@ -110,9 +112,17 @@ fn handle_request(config: &Config, mut request: Request) -> Result Result Response { + Response::new() + .with_status(StatusCode::PERMANENT_REDIRECT) + .with_header(header::LOCATION, destination) +} + /// Limit HTTP methods /// /// Clients are only allowed to request resources using GET and HEAD requests. If any other HTTP @@ -168,6 +184,19 @@ fn rewrite_urls_with_plus_character(request: &mut Request) { } } +/// Rewrite `/archive/version-downloads/` URLs to `/archive/version-downloads/index.html` +/// +/// In this way, users can see what files are available for download. +fn rewrite_version_downloads_urls(request: &mut Request) { + let url = request.get_url_mut(); + let path = url.path(); + + if path == VERSION_DOWNLOADS { + let new_path = format!("{path}index.html"); + url.set_path(&new_path); + } +} + /// Rewrite `/crates/{crate}/{version}/download` URLs to /// `/crates/{crate}/{crate}-{version}.crate` /// From 61e8d378ed5002eff9b76d9ec940a2ce2ed7ae61 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 20 Aug 2024 17:33:42 +0200 Subject: [PATCH 21/21] update crates-io deployed ref --- terragrunt/accounts/legacy/crates-io-prod/deployed-ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/accounts/legacy/crates-io-prod/deployed-ref b/terragrunt/accounts/legacy/crates-io-prod/deployed-ref index 5e2e5211e..a60a6da33 100644 --- a/terragrunt/accounts/legacy/crates-io-prod/deployed-ref +++ b/terragrunt/accounts/legacy/crates-io-prod/deployed-ref @@ -1 +1 @@ -585e9aabc4a5387af5c7aaebd68b095c1fcf89af +fe7f3b92fbe04cd9d36bf36992f653ce27c7e8c7