From 58dc080a67c0f16df7192ecf0bc5724c1732ef8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 21:39:11 +0000 Subject: [PATCH 001/217] Bump openssl from 0.10.55 to 0.10.60 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.55 to 0.10.60. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.55...openssl-v0.10.60) --- updated-dependencies: - dependency-name: openssl dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Cargo.lock | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e4072c091..66cd0b05a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,6 +29,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + [[package]] name = "bumpalo" version = "3.11.1" @@ -74,7 +80,7 @@ version = "4.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "clap_derive", "clap_lex", "is-terminal", @@ -687,11 +693,11 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -719,9 +725,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" dependencies = [ "cc", "libc", @@ -807,7 +813,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -862,7 +868,7 @@ version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -898,7 +904,7 @@ version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", From 6c0e521bb771d148adf7c780b15c5ac1221c34b2 Mon Sep 17 00:00:00 2001 From: Denis Cornehl Date: Thu, 19 Oct 2023 20:05:20 +0200 Subject: [PATCH 002/217] also forward referer header to docs.rs servers --- terraform/docs-rs/cloudfront.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/docs-rs/cloudfront.tf b/terraform/docs-rs/cloudfront.tf index c2b3f4bba..8f16a0bcf 100644 --- a/terraform/docs-rs/cloudfront.tf +++ b/terraform/docs-rs/cloudfront.tf @@ -54,7 +54,7 @@ resource "aws_cloudfront_origin_request_policy" "docs_rs" { headers_config { header_behavior = "whitelist" headers { - items = ["User-Agent"] + items = ["User-Agent", "Referer"] } } From 9ffc6d49b43ba5b9fb7b899d59b4ccf61f8f0bb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 16:05:16 +0000 Subject: [PATCH 003/217] Bump h2 from 0.3.15 to 0.3.24 Bumps [h2](https://github.com/hyperium/h2) from 0.3.15 to 0.3.24. - [Release notes](https://github.com/hyperium/h2/releases) - [Changelog](https://github.com/hyperium/h2/blob/v0.3.24/CHANGELOG.md) - [Commits](https://github.com/hyperium/h2/compare/v0.3.15...v0.3.24) --- updated-dependencies: - dependency-name: h2 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Cargo.lock | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e4072c091..d56c9b1c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -214,6 +214,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.2.8" @@ -324,9 +330,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -343,9 +349,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -478,11 +484,11 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] From d22c54693474494c83f12b328cf72605ad36df34 Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 13 Jul 2023 17:30:53 +0200 Subject: [PATCH 004/217] Manage users on Datadog with Terraform A Terraform module has been created similar to the existing modules to manage team access to Datadog. --- .../team-members-datadog/.terraform.lock.hcl | 24 ++++++++++ terraform/team-members-datadog/README.md | 24 ++++++++++ terraform/team-members-datadog/_terraform.tf | 22 +++++++++ terraform/team-members-datadog/users.tf | 46 +++++++++++++++++++ 4 files changed, 116 insertions(+) create mode 100644 terraform/team-members-datadog/.terraform.lock.hcl create mode 100644 terraform/team-members-datadog/README.md create mode 100644 terraform/team-members-datadog/_terraform.tf create mode 100644 terraform/team-members-datadog/users.tf diff --git a/terraform/team-members-datadog/.terraform.lock.hcl b/terraform/team-members-datadog/.terraform.lock.hcl new file mode 100644 index 000000000..0546475f2 --- /dev/null +++ b/terraform/team-members-datadog/.terraform.lock.hcl @@ -0,0 +1,24 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/datadog/datadog" { + version = "3.24.1" + constraints = "3.24.1" + hashes = [ + "h1:7FvwbbxieQGQqBctXwxVEBZgJeXXgVQ3rbuynJSy9y0=", + "zh:0a3149e789d7edffd889fd02b3598ee43c66d2ebcf0d3f608e1cfe305e70f56a", + "zh:104452645c4226356c46cb92389079c55ed17e11021c1d9bd36f2217ed586f1e", + "zh:200f69afa9825ea930d7da912c9b72374396cce750db21acb202bfc66ebd27b7", + "zh:357fa63c72f4fb78ea66d28f7b18fff8c880d315f23c8670dce788cdbac1996c", + "zh:55eba04889342a55e65be762be69a5360e71fe0c68b92482eaa435e0dcd74013", + "zh:6a17c224f9b20511ffd79c924d188721560d2e7887cb93aeb032202c2d26c893", + "zh:70e5b36790b108844947fc322342a2b521ed6972a6039702799252fc00f89838", + "zh:7887b230c73f7cd3fb630812b0a2df79b726f4c3b937b2da62e3c8ac5ebc07b4", + "zh:835b2c802980118ff122587f836f343db819050024cefe735e6b646f1c43e27c", + "zh:a4485631340ae00b5b97ace7d1a5a2a5375ec257de144837996023a79614c43e", + "zh:a8807355cb035ffae29991fc4251f17fcc159b78e4ddd64175b3b9d4a0049e0b", + "zh:bacc5961ec34e63322ca96d9e9dd6fd3711d31ed63522beae43b58471ce2e86b", + "zh:bad741f97b083ba722cd0d2f0fdd523c4d83a7bdc43dcee6acc4b715f797d94c", + "zh:c1c6acc6d13abbe6c3aa98187537766d280941ae3a89e09ff891ed55a71732ca", + ] +} diff --git a/terraform/team-members-datadog/README.md b/terraform/team-members-datadog/README.md new file mode 100644 index 000000000..3ac48af64 --- /dev/null +++ b/terraform/team-members-datadog/README.md @@ -0,0 +1,24 @@ +# Team Members on Datadog + +This Terraform configuration manages user accounts on Datadog. When a user is +added to [`users.tf`](users.tf), they get invited to join our Datadog account. + +## Roles + +Datadog uses _roles_ to manage who can do what on the platform. + +Members of the infra-admins team are assigned the `Datadog Admin Role` role. +Members of other teams get the `Datadog Standard Role` role. + +## Usage + +Applying the Terraform configuration requires an API key as well as an app key. +Both can be found on the [Datadog API keys page][api-keys]. + +```shell +export DD_API_KEY="datadog-api-key" +export DD_APP_KEY="datadog-app-key" +terraform plan +``` + +[api-keys]: https://app.datadoghq.com/organization-settings/api-keys diff --git a/terraform/team-members-datadog/_terraform.tf b/terraform/team-members-datadog/_terraform.tf new file mode 100644 index 000000000..df6e24da5 --- /dev/null +++ b/terraform/team-members-datadog/_terraform.tf @@ -0,0 +1,22 @@ +// Configuration for Terraform itself. + +terraform { + required_version = "~> 1" + + required_providers { + datadog = { + source = "datadog/datadog" + version = "3.24.1" + } + } + + backend "s3" { + bucket = "rust-terraform" + key = "simpleinfra/team-members-datadog.tfstate" + region = "us-west-1" + dynamodb_table = "terraform-state-lock" + encrypt = true + } +} + +provider "datadog" {} diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf new file mode 100644 index 000000000..0a460c065 --- /dev/null +++ b/terraform/team-members-datadog/users.tf @@ -0,0 +1,46 @@ +locals { + users = { + "jdn" = { + login = "jandavidnose@rustfoundation.org" + name = "Jan David Nose" + role = "Datadog Admin Role" + } + "joel" = { + login = "joelmarcey@rustfoundation.org" + name = "Joel Marcey" + role = "Datadog Admin Role" + } + "mark" = { + login = "mark.simulacrum@gmail.com" + name = "Mark Rousskov" + role = "DataDog Admin Role" + } + "pietro" = { + login = "pietro@pietroalbini.org" + name = "Pietro Albini" + role = "DataDog Admin Role" + } + "rustfoundation" = { + login = "infra@rustfoundation.org" + name = "Rust Foundation Infrastructure" + role = "Datadog Admin Role" + } + } +} + +data "datadog_role" "role" { + for_each = toset(values({ + for index, user in local.users : user.login => user.role + })) + + filter = each.value +} + +resource "datadog_user" "users" { + for_each = local.users + + email = each.value.login + name = each.value.name + roles = [data.datadog_role.role[each.value.role].id] + send_user_invitation = true +} From aa973fd8510a211f8a9c4b81759a70882381c82f Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 16 Aug 2023 17:10:32 +0200 Subject: [PATCH 005/217] Add account for Rust admin --- terraform/team-members-datadog/users.tf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index 0a460c065..1e729209f 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -1,5 +1,10 @@ locals { users = { + "admin" = { + login = "admin@rust-lang.org" + name = "Rust Admin" + role = "Datadog Admin Role" + } "jdn" = { login = "jandavidnose@rustfoundation.org" name = "Jan David Nose" From 1775650513f5aed21b3c2ea5947330d365d1a79a Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 3 Oct 2023 15:14:55 +0200 Subject: [PATCH 006/217] Add accounts for Rust Foundation staff --- terraform/team-members-datadog/users.tf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index 1e729209f..25244828b 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -20,6 +20,11 @@ locals { name = "Mark Rousskov" role = "DataDog Admin Role" } + "paullenz" = { + login = "paullenz@rustfoundation.org" + name = "Paul Lenz" + role = "Datadog Read Only Role" + } "pietro" = { login = "pietro@pietroalbini.org" name = "Pietro Albini" @@ -30,6 +35,11 @@ locals { name = "Rust Foundation Infrastructure" role = "Datadog Admin Role" } + "tobias" = { + login = "tobiasbieniek@rustfoundation.org" + name = "Tobias Bieniek" + role = "Datadog Standard Role" + } } } From c251c642ce25e30188111140600e0caad3111fc6 Mon Sep 17 00:00:00 2001 From: Jan David Date: Fri, 6 Oct 2023 14:54:59 +0200 Subject: [PATCH 007/217] Create teams on Datadog --- .../team-members-datadog/.terraform.lock.hcl | 34 ++++++------- terraform/team-members-datadog/_terraform.tf | 2 +- terraform/team-members-datadog/teams.tf | 50 +++++++++++++++++++ 3 files changed, 68 insertions(+), 18 deletions(-) create mode 100644 terraform/team-members-datadog/teams.tf diff --git a/terraform/team-members-datadog/.terraform.lock.hcl b/terraform/team-members-datadog/.terraform.lock.hcl index 0546475f2..33c9bfbcf 100644 --- a/terraform/team-members-datadog/.terraform.lock.hcl +++ b/terraform/team-members-datadog/.terraform.lock.hcl @@ -2,23 +2,23 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/datadog/datadog" { - version = "3.24.1" - constraints = "3.24.1" + version = "3.30.0" + constraints = "3.30.0" hashes = [ - "h1:7FvwbbxieQGQqBctXwxVEBZgJeXXgVQ3rbuynJSy9y0=", - "zh:0a3149e789d7edffd889fd02b3598ee43c66d2ebcf0d3f608e1cfe305e70f56a", - "zh:104452645c4226356c46cb92389079c55ed17e11021c1d9bd36f2217ed586f1e", - "zh:200f69afa9825ea930d7da912c9b72374396cce750db21acb202bfc66ebd27b7", - "zh:357fa63c72f4fb78ea66d28f7b18fff8c880d315f23c8670dce788cdbac1996c", - "zh:55eba04889342a55e65be762be69a5360e71fe0c68b92482eaa435e0dcd74013", - "zh:6a17c224f9b20511ffd79c924d188721560d2e7887cb93aeb032202c2d26c893", - "zh:70e5b36790b108844947fc322342a2b521ed6972a6039702799252fc00f89838", - "zh:7887b230c73f7cd3fb630812b0a2df79b726f4c3b937b2da62e3c8ac5ebc07b4", - "zh:835b2c802980118ff122587f836f343db819050024cefe735e6b646f1c43e27c", - "zh:a4485631340ae00b5b97ace7d1a5a2a5375ec257de144837996023a79614c43e", - "zh:a8807355cb035ffae29991fc4251f17fcc159b78e4ddd64175b3b9d4a0049e0b", - "zh:bacc5961ec34e63322ca96d9e9dd6fd3711d31ed63522beae43b58471ce2e86b", - "zh:bad741f97b083ba722cd0d2f0fdd523c4d83a7bdc43dcee6acc4b715f797d94c", - "zh:c1c6acc6d13abbe6c3aa98187537766d280941ae3a89e09ff891ed55a71732ca", + "h1:oN61IZ1rl+rfzXw0UVVnmFZ/Ulk8bKBsALN6O+p5vqs=", + "zh:01fc43eae96ea3801d95f81e83f151e64ef91dc4b1aedd3ee857c073a891a05d", + "zh:169ca1d8ae0cbb613fa9a7039babffa0a9bc62200d5ac5a027e259b98d8df33e", + "zh:22d75dc6dd9fde39ca1b2b5ceac7026aed2ad801cf81a587dd93e25b94c56ca4", + "zh:4bccc0639a881d44be4e7e2868fe1e0dbc1f0a6ebad1e1e554808bc80979c02c", + "zh:6295eb99ff106e00da52dba699e0b7fcba8b4d0535eac26d61eb17ddde5c2c53", + "zh:68c7de436a0e33ae06e93a5e989445dcc944a102faaec7e9f84762688520bd3c", + "zh:7c3ab23ebe2269c9952a8e91ddc6b05889186c81bb472eed0fdd6cd730350d6f", + "zh:85508c9c377211bd44531824464bf81830badb47e02877b008fce5de02204639", + "zh:8bb6a27c39e7d81d5d8bae00a159aa6a9e665e365393e65602839268893da1cc", + "zh:97f542f3e33df80a245b9f85fb29582fd3598bca4be3ceafd8aa012ba15f88c2", + "zh:cc051226ba800ae5c73a219c775c4fd883203381a4baaa2b1e211545407e42f3", + "zh:cea8b53a4bba00b1c452af5bb5a16d46e56f9d04dacfbcf794397aea105e17c6", + "zh:d56c39142843e945a08b23da9b147817b9b67f8f293b6a8253cd932c095f61b4", + "zh:d7aa186ec0dff53ee776472c902685437d76abe31e9a6872d74c03f0ae25ff3b", ] } diff --git a/terraform/team-members-datadog/_terraform.tf b/terraform/team-members-datadog/_terraform.tf index df6e24da5..4e7036be4 100644 --- a/terraform/team-members-datadog/_terraform.tf +++ b/terraform/team-members-datadog/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { datadog = { source = "datadog/datadog" - version = "3.24.1" + version = "3.30.0" } } diff --git a/terraform/team-members-datadog/teams.tf b/terraform/team-members-datadog/teams.tf new file mode 100644 index 000000000..ed73ac637 --- /dev/null +++ b/terraform/team-members-datadog/teams.tf @@ -0,0 +1,50 @@ +locals { + infra_admins = { + admin = datadog_user.users["admin"].id, + jdn = datadog_user.users["jdn"].id, + mark = datadog_user.users["mark"].id, + pietro = datadog_user.users["pietro"].id, + } +} + +resource "datadog_team" "infra_admins" { + description = "Administrators of the infra-team" + handle = "infra-admins" + name = "infra-admins" +} + +resource "datadog_team_membership" "infra_admins" { + for_each = local.infra_admins + + team_id = datadog_team.infra_admins.id + user_id = each.value +} + +resource "datadog_team" "infra" { + description = "The infrastructure team" + handle = "infra" + name = "infra" +} + +resource "datadog_team_membership" "infra" { + for_each = merge(local.infra_admins, { + }) + + team_id = datadog_team.infra.id + user_id = each.value +} + +resource "datadog_team" "crates_io" { + description = "The crates.io team" + handle = "crates-io" + name = "crates.io" +} + +resource "datadog_team_membership" "crates_io" { + for_each = merge(local.infra_admins, { + tobias = datadog_user.users["tobias"].id, + }) + + team_id = datadog_team.crates_io.id + user_id = each.value +} From 6fbee796f4cadfa851bc3c95523a5d5a11b6af54 Mon Sep 17 00:00:00 2001 From: Jan David Date: Mon, 23 Oct 2023 13:06:34 +0200 Subject: [PATCH 008/217] Use roles for RBAC Instead of relying on teams to tag incoming resources and to use them in restriction queries, we are using teams and the `service` or `app` tag to control access to resources. The teams have been removed again, and a more limited role for contributors and a "marker role" for the crates.io team have been created. --- terraform/team-members-datadog/roles.tf | 26 +++++++++++++ terraform/team-members-datadog/teams.tf | 50 ------------------------- terraform/team-members-datadog/users.tf | 24 ++++++------ 3 files changed, 38 insertions(+), 62 deletions(-) create mode 100644 terraform/team-members-datadog/roles.tf delete mode 100644 terraform/team-members-datadog/teams.tf diff --git a/terraform/team-members-datadog/roles.tf b/terraform/team-members-datadog/roles.tf new file mode 100644 index 000000000..d840ab7e5 --- /dev/null +++ b/terraform/team-members-datadog/roles.tf @@ -0,0 +1,26 @@ +# Fetch all available permissions +data "datadog_permissions" "all" {} + +resource "datadog_role" "contributor" { + name = "Contributor" + + dynamic "permission" { + for_each = toset([ + data.datadog_permissions.all.permissions.logs_read_index_data, + data.datadog_permissions.all.permissions.logs_read_data, + data.datadog_permissions.all.permissions.logs_live_tail, + data.datadog_permissions.all.permissions.logs_read_archives, + data.datadog_permissions.all.permissions.dashboards_write, + ]) + + content { + id = permission.value + } + } +} + +# This is a marker role that is applied to users on top of their other roles. +# It grants access to the log assets for crates.io. +resource "datadog_role" "crates_io" { + name = "crates.io" +} diff --git a/terraform/team-members-datadog/teams.tf b/terraform/team-members-datadog/teams.tf deleted file mode 100644 index ed73ac637..000000000 --- a/terraform/team-members-datadog/teams.tf +++ /dev/null @@ -1,50 +0,0 @@ -locals { - infra_admins = { - admin = datadog_user.users["admin"].id, - jdn = datadog_user.users["jdn"].id, - mark = datadog_user.users["mark"].id, - pietro = datadog_user.users["pietro"].id, - } -} - -resource "datadog_team" "infra_admins" { - description = "Administrators of the infra-team" - handle = "infra-admins" - name = "infra-admins" -} - -resource "datadog_team_membership" "infra_admins" { - for_each = local.infra_admins - - team_id = datadog_team.infra_admins.id - user_id = each.value -} - -resource "datadog_team" "infra" { - description = "The infrastructure team" - handle = "infra" - name = "infra" -} - -resource "datadog_team_membership" "infra" { - for_each = merge(local.infra_admins, { - }) - - team_id = datadog_team.infra.id - user_id = each.value -} - -resource "datadog_team" "crates_io" { - description = "The crates.io team" - handle = "crates-io" - name = "crates.io" -} - -resource "datadog_team_membership" "crates_io" { - for_each = merge(local.infra_admins, { - tobias = datadog_user.users["tobias"].id, - }) - - team_id = datadog_team.crates_io.id - user_id = each.value -} diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index 25244828b..3669f2e3e 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -3,50 +3,50 @@ locals { "admin" = { login = "admin@rust-lang.org" name = "Rust Admin" - role = "Datadog Admin Role" + roles = ["Datadog Admin Role"] } "jdn" = { login = "jandavidnose@rustfoundation.org" name = "Jan David Nose" - role = "Datadog Admin Role" + roles = ["Datadog Admin Role"] } "joel" = { login = "joelmarcey@rustfoundation.org" name = "Joel Marcey" - role = "Datadog Admin Role" + roles = ["Datadog Admin Role"] } "mark" = { login = "mark.simulacrum@gmail.com" name = "Mark Rousskov" - role = "DataDog Admin Role" + roles = ["DataDog Admin Role"] } "paullenz" = { login = "paullenz@rustfoundation.org" name = "Paul Lenz" - role = "Datadog Read Only Role" + roles = ["Datadog Read Only Role"] } "pietro" = { login = "pietro@pietroalbini.org" name = "Pietro Albini" - role = "DataDog Admin Role" + roles = ["DataDog Admin Role"] } "rustfoundation" = { login = "infra@rustfoundation.org" name = "Rust Foundation Infrastructure" - role = "Datadog Admin Role" + roles = ["Datadog Admin Role"] } "tobias" = { login = "tobiasbieniek@rustfoundation.org" name = "Tobias Bieniek" - role = "Datadog Standard Role" + roles = ["Contributor", "crates.io"] } } } data "datadog_role" "role" { - for_each = toset(values({ - for index, user in local.users : user.login => user.role - })) + for_each = toset(flatten(values({ + for index, user in local.users : user.login => user.roles + }))) filter = each.value } @@ -56,6 +56,6 @@ resource "datadog_user" "users" { email = each.value.login name = each.value.name - roles = [data.datadog_role.role[each.value.role].id] + roles = [for role in each.value.roles : data.datadog_role.role[role].id] send_user_invitation = true } From d8012d1508275ee52598989e8a20c204ee5f044f Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 14 Nov 2023 16:12:54 +0100 Subject: [PATCH 009/217] Create role for board members Some board members are interested in some of our metrics as part of their work in the different committees of the board. A very limited read-only role has been created to grant them access to our organization. --- terraform/team-members-datadog/roles.tf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/terraform/team-members-datadog/roles.tf b/terraform/team-members-datadog/roles.tf index d840ab7e5..0a92a742c 100644 --- a/terraform/team-members-datadog/roles.tf +++ b/terraform/team-members-datadog/roles.tf @@ -1,6 +1,21 @@ # Fetch all available permissions data "datadog_permissions" "all" {} +resource "datadog_role" "board_member" { + name = "Board Member" + + dynamic "permission" { + for_each = toset([ + data.datadog_permissions.all.permissions.dashboards_write, + ]) + + content { + id = permission.value + } + } +} + + resource "datadog_role" "contributor" { name = "Contributor" From 7e88c5449d09ec7fc675ca4b13a74065e2efd73e Mon Sep 17 00:00:00 2001 From: Jan David Date: Fri, 8 Dec 2023 17:14:27 +0100 Subject: [PATCH 010/217] Refactor role for crates.io The marker role did not work as expected, since contributors had unrestricted access to logs. The `Contributor` role has been removed for this reason, and its permissions are now explicitly granted to members of the `crates-io` role. --- terraform/team-members-datadog/roles.tf | 12 ++---------- terraform/team-members-datadog/users.tf | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/terraform/team-members-datadog/roles.tf b/terraform/team-members-datadog/roles.tf index 0a92a742c..64225d6be 100644 --- a/terraform/team-members-datadog/roles.tf +++ b/terraform/team-members-datadog/roles.tf @@ -15,13 +15,11 @@ resource "datadog_role" "board_member" { } } - -resource "datadog_role" "contributor" { - name = "Contributor" +resource "datadog_role" "crates_io" { + name = "crates.io" dynamic "permission" { for_each = toset([ - data.datadog_permissions.all.permissions.logs_read_index_data, data.datadog_permissions.all.permissions.logs_read_data, data.datadog_permissions.all.permissions.logs_live_tail, data.datadog_permissions.all.permissions.logs_read_archives, @@ -33,9 +31,3 @@ resource "datadog_role" "contributor" { } } } - -# This is a marker role that is applied to users on top of their other roles. -# It grants access to the log assets for crates.io. -resource "datadog_role" "crates_io" { - name = "crates.io" -} diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index 3669f2e3e..ac508c08b 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -38,7 +38,7 @@ locals { "tobias" = { login = "tobiasbieniek@rustfoundation.org" name = "Tobias Bieniek" - roles = ["Contributor", "crates.io"] + roles = ["Datadog Standard Role", "crates.io"] } } } From 509508ca4bd911bd95270d10078fac41f9c3ff01 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 12 Dec 2023 14:49:49 +0100 Subject: [PATCH 011/217] Add board members --- terraform/team-members-datadog/users.tf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index ac508c08b..48038341a 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -20,11 +20,21 @@ locals { name = "Mark Rousskov" roles = ["DataDog Admin Role"] } + "nell" = { + login = "nells@microsoft.com" + name = "Nell Shamrell-Harrington" + roles = ["Board Member"] + } "paullenz" = { login = "paullenz@rustfoundation.org" name = "Paul Lenz" roles = ["Datadog Read Only Role"] } + "peixin" = { + login = "peixin.hou@gmail.com" + name = "Peixin Hou" + roles = ["Board Member"] + } "pietro" = { login = "pietro@pietroalbini.org" name = "Pietro Albini" @@ -35,6 +45,11 @@ locals { name = "Rust Foundation Infrastructure" roles = ["Datadog Admin Role"] } + "seth" = { + login = "smarkle.aws@gmail.com" + name = "Seth Markle" + roles = ["Board Member"] + } "tobias" = { login = "tobiasbieniek@rustfoundation.org" name = "Tobias Bieniek" From 84901d396aae87fd1e9d219052fdb2fb2f5a1056 Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 8 Feb 2024 13:43:43 +0100 Subject: [PATCH 012/217] Split users into multiple files The list of users has been split into multiple files, each representing a single team. This makes it much easier to manage the access for individual teams. An unsolved problem is that users can be members of multiple teams, which is not modelled yet. --- terraform/team-members-datadog/crates-io.tf | 8 +++ .../team-members-datadog/foundation-board.tf | 16 +++++ terraform/team-members-datadog/foundation.tf | 8 +++ .../team-members-datadog/infra-admins.tf | 28 +++++++++ terraform/team-members-datadog/outputs.tf | 3 + terraform/team-members-datadog/users.tf | 63 ++----------------- 6 files changed, 69 insertions(+), 57 deletions(-) create mode 100644 terraform/team-members-datadog/crates-io.tf create mode 100644 terraform/team-members-datadog/foundation-board.tf create mode 100644 terraform/team-members-datadog/foundation.tf create mode 100644 terraform/team-members-datadog/infra-admins.tf create mode 100644 terraform/team-members-datadog/outputs.tf diff --git a/terraform/team-members-datadog/crates-io.tf b/terraform/team-members-datadog/crates-io.tf new file mode 100644 index 000000000..ef5c738de --- /dev/null +++ b/terraform/team-members-datadog/crates-io.tf @@ -0,0 +1,8 @@ +locals { + crates_io = { + "tobias" = { + login = "tobiasbieniek@rustfoundation.org" + name = "Tobias Bieniek" + } + } +} diff --git a/terraform/team-members-datadog/foundation-board.tf b/terraform/team-members-datadog/foundation-board.tf new file mode 100644 index 000000000..05aa5c1a3 --- /dev/null +++ b/terraform/team-members-datadog/foundation-board.tf @@ -0,0 +1,16 @@ +locals { + foundation_board = { + "nell" = { + login = "nells@microsoft.com" + name = "Nell Shamrell-Harrington" + } + "peixin" = { + login = "peixin.hou@gmail.com" + name = "Peixin Hou" + } + "seth" = { + login = "smarkle.aws@gmail.com" + name = "Seth Markle" + } + } +} diff --git a/terraform/team-members-datadog/foundation.tf b/terraform/team-members-datadog/foundation.tf new file mode 100644 index 000000000..e977e7d54 --- /dev/null +++ b/terraform/team-members-datadog/foundation.tf @@ -0,0 +1,8 @@ +locals { + foundation = { + "paullenz" = { + login = "paullenz@rustfoundation.org" + name = "Paul Lenz" + } + } +} diff --git a/terraform/team-members-datadog/infra-admins.tf b/terraform/team-members-datadog/infra-admins.tf new file mode 100644 index 000000000..f26548f8d --- /dev/null +++ b/terraform/team-members-datadog/infra-admins.tf @@ -0,0 +1,28 @@ +locals { + infra_admins = { + "admin" = { + login = "admin@rust-lang.org" + name = "Rust Admin" + } + "jdn" = { + login = "jandavidnose@rustfoundation.org" + name = "Jan David Nose" + } + "joel" = { + login = "joelmarcey@rustfoundation.org" + name = "Joel Marcey" + } + "mark" = { + login = "mark.simulacrum@gmail.com" + name = "Mark Rousskov" + } + "pietro" = { + login = "pietro@pietroalbini.org" + name = "Pietro Albini" + } + "rustfoundation" = { + login = "infra@rustfoundation.org" + name = "Rust Foundation Infrastructure" + } + } +} diff --git a/terraform/team-members-datadog/outputs.tf b/terraform/team-members-datadog/outputs.tf new file mode 100644 index 000000000..b06caa212 --- /dev/null +++ b/terraform/team-members-datadog/outputs.tf @@ -0,0 +1,3 @@ +output "users" { + value = local.users +} diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index 48038341a..04608573e 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -1,61 +1,10 @@ locals { - users = { - "admin" = { - login = "admin@rust-lang.org" - name = "Rust Admin" - roles = ["Datadog Admin Role"] - } - "jdn" = { - login = "jandavidnose@rustfoundation.org" - name = "Jan David Nose" - roles = ["Datadog Admin Role"] - } - "joel" = { - login = "joelmarcey@rustfoundation.org" - name = "Joel Marcey" - roles = ["Datadog Admin Role"] - } - "mark" = { - login = "mark.simulacrum@gmail.com" - name = "Mark Rousskov" - roles = ["DataDog Admin Role"] - } - "nell" = { - login = "nells@microsoft.com" - name = "Nell Shamrell-Harrington" - roles = ["Board Member"] - } - "paullenz" = { - login = "paullenz@rustfoundation.org" - name = "Paul Lenz" - roles = ["Datadog Read Only Role"] - } - "peixin" = { - login = "peixin.hou@gmail.com" - name = "Peixin Hou" - roles = ["Board Member"] - } - "pietro" = { - login = "pietro@pietroalbini.org" - name = "Pietro Albini" - roles = ["DataDog Admin Role"] - } - "rustfoundation" = { - login = "infra@rustfoundation.org" - name = "Rust Foundation Infrastructure" - roles = ["Datadog Admin Role"] - } - "seth" = { - login = "smarkle.aws@gmail.com" - name = "Seth Markle" - roles = ["Board Member"] - } - "tobias" = { - login = "tobiasbieniek@rustfoundation.org" - name = "Tobias Bieniek" - roles = ["Datadog Standard Role", "crates.io"] - } - } + users = merge( + { for name, user in local.crates_io : name => merge(user, { roles = ["crates.io"] }) }, + { for name, user in local.foundation : name => merge(user, { roles = ["Datadog Read Only Role"] }) }, + { for name, user in local.foundation_board : name => merge(user, { roles = ["Board Member"] }) }, + { for name, user in local.infra_admins : name => merge(user, { roles = ["Datadog Admin Role"] }) }, + ) } data "datadog_role" "role" { From b7fc567e12ef9fba75535555da0359a607106d08 Mon Sep 17 00:00:00 2001 From: Jan David Date: Fri, 9 Feb 2024 15:50:48 +0100 Subject: [PATCH 013/217] Create teams on Datadog Teams are a relatively new feature on Datadog that makes it easier to share resources with a specific subset of users. For example, dashboards can be owned by teams and surfaced more prominently to members of that team. --- terraform/team-members-datadog/_data.tf | 2 ++ terraform/team-members-datadog/crates-io.tf | 30 +++++++++++++++++ .../team-members-datadog/foundation-board.tf | 27 +++++++++++++++ terraform/team-members-datadog/foundation.tf | 13 ++++++++ .../team-members-datadog/infra-admins.tf | 13 ++++++++ terraform/team-members-datadog/roles.tf | 33 ------------------- 6 files changed, 85 insertions(+), 33 deletions(-) create mode 100644 terraform/team-members-datadog/_data.tf delete mode 100644 terraform/team-members-datadog/roles.tf diff --git a/terraform/team-members-datadog/_data.tf b/terraform/team-members-datadog/_data.tf new file mode 100644 index 000000000..58e29fae4 --- /dev/null +++ b/terraform/team-members-datadog/_data.tf @@ -0,0 +1,2 @@ +# Fetch all available permissions +data "datadog_permissions" "all" {} diff --git a/terraform/team-members-datadog/crates-io.tf b/terraform/team-members-datadog/crates-io.tf index ef5c738de..dbcaae2d8 100644 --- a/terraform/team-members-datadog/crates-io.tf +++ b/terraform/team-members-datadog/crates-io.tf @@ -6,3 +6,33 @@ locals { } } } + +resource "datadog_role" "crates_io" { + name = "crates.io" + + dynamic "permission" { + for_each = toset([ + data.datadog_permissions.all.permissions.logs_read_data, + data.datadog_permissions.all.permissions.logs_live_tail, + data.datadog_permissions.all.permissions.logs_read_archives, + data.datadog_permissions.all.permissions.dashboards_write, + ]) + + content { + id = permission.value + } + } +} + +resource "datadog_team" "crates_io" { + name = "crates.io" + description = "The team working on crates.io" + handle = "crates-io" +} + +resource "datadog_team_membership" "crates_io" { + for_each = local.crates_io + + team_id = datadog_team.crates_io.id + user_id = datadog_user.users[each.key].id +} diff --git a/terraform/team-members-datadog/foundation-board.tf b/terraform/team-members-datadog/foundation-board.tf index 05aa5c1a3..cc197d704 100644 --- a/terraform/team-members-datadog/foundation-board.tf +++ b/terraform/team-members-datadog/foundation-board.tf @@ -14,3 +14,30 @@ locals { } } } + +resource "datadog_role" "board_member" { + name = "Board Member" + + dynamic "permission" { + for_each = toset([ + data.datadog_permissions.all.permissions.dashboards_write, + ]) + + content { + id = permission.value + } + } +} + +resource "datadog_team" "foundation_board" { + name = "Rust Foundation Board" + description = "The board of the Rust Foundation" + handle = "foundation-board" +} + +resource "datadog_team_membership" "foundation_board" { + for_each = local.foundation_board + + team_id = datadog_team.foundation_board.id + user_id = datadog_user.users[each.key].id +} diff --git a/terraform/team-members-datadog/foundation.tf b/terraform/team-members-datadog/foundation.tf index e977e7d54..bfd825b5f 100644 --- a/terraform/team-members-datadog/foundation.tf +++ b/terraform/team-members-datadog/foundation.tf @@ -6,3 +6,16 @@ locals { } } } + +resource "datadog_team" "foundation" { + name = "Rust Foundation" + description = "The staff of the Rust Foundation" + handle = "foundation" +} + +resource "datadog_team_membership" "foundation" { + for_each = local.foundation + + team_id = datadog_team.foundation.id + user_id = datadog_user.users[each.key].id +} diff --git a/terraform/team-members-datadog/infra-admins.tf b/terraform/team-members-datadog/infra-admins.tf index f26548f8d..623a2e88c 100644 --- a/terraform/team-members-datadog/infra-admins.tf +++ b/terraform/team-members-datadog/infra-admins.tf @@ -26,3 +26,16 @@ locals { } } } + +resource "datadog_team" "infra_admins" { + name = "Infrastructure Admins" + description = "The infra-admins" + handle = "infra-admins" +} + +resource "datadog_team_membership" "infra_admins" { + for_each = local.infra_admins + + team_id = datadog_team.infra_admins.id + user_id = datadog_user.users[each.key].id +} diff --git a/terraform/team-members-datadog/roles.tf b/terraform/team-members-datadog/roles.tf deleted file mode 100644 index 64225d6be..000000000 --- a/terraform/team-members-datadog/roles.tf +++ /dev/null @@ -1,33 +0,0 @@ -# Fetch all available permissions -data "datadog_permissions" "all" {} - -resource "datadog_role" "board_member" { - name = "Board Member" - - dynamic "permission" { - for_each = toset([ - data.datadog_permissions.all.permissions.dashboards_write, - ]) - - content { - id = permission.value - } - } -} - -resource "datadog_role" "crates_io" { - name = "crates.io" - - dynamic "permission" { - for_each = toset([ - data.datadog_permissions.all.permissions.logs_read_data, - data.datadog_permissions.all.permissions.logs_live_tail, - data.datadog_permissions.all.permissions.logs_read_archives, - data.datadog_permissions.all.permissions.dashboards_write, - ]) - - content { - id = permission.value - } - } -} From 9f454b05683b42633086cf1a8fc92efd37d818ae Mon Sep 17 00:00:00 2001 From: Jan David Date: Fri, 9 Feb 2024 17:34:11 +0100 Subject: [PATCH 014/217] Merge roles for each user When a user is part of multiple teams, they might have multiple roles. These are now all assigned to the user, and Datadog will determine the user's permissions based on that list. --- terraform/team-members-datadog/outputs.tf | 3 -- terraform/team-members-datadog/users.tf | 52 ++++++++++++++++++++--- 2 files changed, 46 insertions(+), 9 deletions(-) delete mode 100644 terraform/team-members-datadog/outputs.tf diff --git a/terraform/team-members-datadog/outputs.tf b/terraform/team-members-datadog/outputs.tf deleted file mode 100644 index b06caa212..000000000 --- a/terraform/team-members-datadog/outputs.tf +++ /dev/null @@ -1,3 +0,0 @@ -output "users" { - value = local.users -} diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index 04608573e..07e64d67a 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -1,22 +1,62 @@ locals { - users = merge( - { for name, user in local.crates_io : name => merge(user, { roles = ["crates.io"] }) }, + # This is a list of all users from all teams. When a user is part of multiple teams, this list will contain multiple + # entries for that user (one for each team). These entries will have different roles. + # + # Example: + # + # [ + # { "alice" = { login = "Alice", email = "alice@example.com", roles = ["crates.io"] } }, + # { "bob" = { login = "Bob", email = "bob@example.com", roles = ["Board Member"] } }, + # { "alice" = { login = "Alice", email = "alice@example.com", roles = ["Foundation Staff"] } }, + # ] + _do_not_use_all_teams = [ + { for name, user in local.crates_io : name => merge(user, { roles = [datadog_role.crates_io.name] }) }, { for name, user in local.foundation : name => merge(user, { roles = ["Datadog Read Only Role"] }) }, - { for name, user in local.foundation_board : name => merge(user, { roles = ["Board Member"] }) }, + { for name, user in local.foundation_board : name => merge(user, { roles = [datadog_role.board_member.name] }) }, { for name, user in local.infra_admins : name => merge(user, { roles = ["Datadog Admin Role"] }) }, - ) + ] + + # This is an intermediate list that contains a single entry per user, but only with the roles from the first team. + # The list is used in the next step to merge all roles for each user. + # Example: + # + # { + # "alice" = { login = "Alice", email = "alice@example.com", roles = ["crates.io"] }, + # "bob" = { login = "Bob", email = "bob@example.com", roles = ["Board Member"] } + # } + _do_not_use_all_users_with_single_role = merge(local._do_not_use_all_teams...) + + # This list contains a single entry per user, with all the roles that user has across all teams. + # + # Example: + # + # [ + # { "alice" = { login = "Alice", email = "alice@example.com", roles = ["crates.io", "Foundation Staff"] } }, + # { "bob" = { login = "Bob", email = "bob@example.com", roles = ["Board Member"] } }, + # ] + all_user_with_merged_roles = { + for name, user in local._do_not_use_all_users_with_single_role : name => { + login = user.login + name = user.name + roles = distinct(flatten([ + for team in local._do_not_use_all_teams : concat([ + for inner_name, user in team : user.roles if name == inner_name + ]) + ])) + } + } } data "datadog_role" "role" { for_each = toset(flatten(values({ - for index, user in local.users : user.login => user.roles + for index, user in local.all_user_with_merged_roles : user.login => user.roles }))) filter = each.value } resource "datadog_user" "users" { - for_each = local.users + for_each = local.all_user_with_merged_roles email = each.value.login name = each.value.name From 4a29baf8babb44ae1567c533d1c92b81447a1572 Mon Sep 17 00:00:00 2001 From: Jan David Date: Mon, 12 Feb 2024 13:39:45 +0100 Subject: [PATCH 015/217] Restore access to logs for crates.io team --- terraform/team-members-datadog/crates-io.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/team-members-datadog/crates-io.tf b/terraform/team-members-datadog/crates-io.tf index dbcaae2d8..b4f23ce11 100644 --- a/terraform/team-members-datadog/crates-io.tf +++ b/terraform/team-members-datadog/crates-io.tf @@ -12,6 +12,7 @@ resource "datadog_role" "crates_io" { dynamic "permission" { for_each = toset([ + data.datadog_permissions.all.permissions.logs_read_index_data, data.datadog_permissions.all.permissions.logs_read_data, data.datadog_permissions.all.permissions.logs_live_tail, data.datadog_permissions.all.permissions.logs_read_archives, From 0a7ee08d4d2b310ba3e24566375925286ca30239 Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 15 Feb 2024 11:44:09 +0100 Subject: [PATCH 016/217] Add Foundation staff to foundation team --- terraform/team-members-datadog/crates-io.tf | 4 ++++ terraform/team-members-datadog/foundation.tf | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/terraform/team-members-datadog/crates-io.tf b/terraform/team-members-datadog/crates-io.tf index b4f23ce11..64d0d6f82 100644 --- a/terraform/team-members-datadog/crates-io.tf +++ b/terraform/team-members-datadog/crates-io.tf @@ -1,5 +1,9 @@ locals { crates_io = { + "adam" = { + login = "adamharvey@rustfoundation.org" + name = "Adam Harvey" + } "tobias" = { login = "tobiasbieniek@rustfoundation.org" name = "Tobias Bieniek" diff --git a/terraform/team-members-datadog/foundation.tf b/terraform/team-members-datadog/foundation.tf index bfd825b5f..db3ecee0f 100644 --- a/terraform/team-members-datadog/foundation.tf +++ b/terraform/team-members-datadog/foundation.tf @@ -1,9 +1,29 @@ locals { foundation = { + "adam" = { + login = "adamharvey@rustfoundation.org" + name = "Adam Harvey" + } + "jdn" = { + login = "jandavidnose@rustfoundation.org" + name = "Jan David Nose" + } + "joel" = { + login = "joelmarcey@rustfoundation.org" + name = "Joel Marcey" + } "paullenz" = { login = "paullenz@rustfoundation.org" name = "Paul Lenz" } + "rustfoundation" = { + login = "infra@rustfoundation.org" + name = "Rust Foundation Infrastructure" + } + "tobias" = { + login = "tobiasbieniek@rustfoundation.org" + name = "Tobias Bieniek" + } } } From df2f4671b637b071d964a4a1ee9e65fd35868f46 Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 15 Feb 2024 12:01:09 +0100 Subject: [PATCH 017/217] Create role for Rust Foundation staff --- terraform/team-members-datadog/foundation.tf | 14 ++++++++++++++ terraform/team-members-datadog/users.tf | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/terraform/team-members-datadog/foundation.tf b/terraform/team-members-datadog/foundation.tf index db3ecee0f..e8a97fbce 100644 --- a/terraform/team-members-datadog/foundation.tf +++ b/terraform/team-members-datadog/foundation.tf @@ -27,6 +27,20 @@ locals { } } +resource "datadog_role" "foundation" { + name = "Rust Foundation" + + dynamic "permission" { + for_each = toset([ + data.datadog_permissions.all.permissions.dashboards_write, + ]) + + content { + id = permission.value + } + } +} + resource "datadog_team" "foundation" { name = "Rust Foundation" description = "The staff of the Rust Foundation" diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index 07e64d67a..0345bda58 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -11,7 +11,7 @@ locals { # ] _do_not_use_all_teams = [ { for name, user in local.crates_io : name => merge(user, { roles = [datadog_role.crates_io.name] }) }, - { for name, user in local.foundation : name => merge(user, { roles = ["Datadog Read Only Role"] }) }, + { for name, user in local.foundation : name => merge(user, { roles = [datadog_role.foundation.name] }) }, { for name, user in local.foundation_board : name => merge(user, { roles = [datadog_role.board_member.name] }) }, { for name, user in local.infra_admins : name => merge(user, { roles = ["Datadog Admin Role"] }) }, ] From 2f3b07b9786de3ba6a3c746d00ca0337659f20dc Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 27 Feb 2024 14:20:26 +0100 Subject: [PATCH 018/217] Tag Fastly logs for Datadog Datadog has a few reserved attributes[^1] that have a special meaning on its platform. The logs that the Fastly service generates now set two of them, namely the source and the service. Both will make it easier to process the logs in Datadog's log pipeline. [^1]: https://docs.datadoghq.com/logs/log_configuration/attributes_naming_convention/#reserved-attributes --- .../modules/crates-io/compute-static/src/config.rs | 10 ++++++++++ .../modules/crates-io/compute-static/src/log_line.rs | 9 +++++++++ .../modules/crates-io/compute-static/src/main.rs | 5 +++-- terragrunt/modules/crates-io/fastly-static.tf | 1 + 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/terragrunt/modules/crates-io/compute-static/src/config.rs b/terragrunt/modules/crates-io/compute-static/src/config.rs index d7bd787f3..1d608a85d 100644 --- a/terragrunt/modules/crates-io/compute-static/src/config.rs +++ b/terragrunt/modules/crates-io/compute-static/src/config.rs @@ -6,6 +6,9 @@ const DICTIONARY_NAME: &str = "compute_static"; // Name of the dictionary item with the CloudFront URL const CLOUDFRONT_URL: &str = "cloudfront-url"; +// Name of the dictionary item with the name of the service. +const SERVICE_NAME: &str = "service-name"; + // Name of the dictionary item with the name of the primary host. const PRIMARY_HOST: &str = "s3-primary-host"; @@ -23,6 +26,7 @@ const SERVICE_LOGS_ENDPOINT: &str = "service-logs-endpoint"; #[derive(Debug)] pub struct Config { + pub service_name: String, pub primary_host: String, pub fallback_host: String, pub static_ttl: u32, @@ -35,6 +39,11 @@ impl Config { pub fn from_dictionary() -> Self { let dictionary = ConfigStore::open(DICTIONARY_NAME); + // Look up the name of the service + let service_name = dictionary + .get(SERVICE_NAME) + .expect("failed to get service name from dictionary"); + // Look up S3 hosts for current environment let primary_host = dictionary .get(PRIMARY_HOST) @@ -62,6 +71,7 @@ impl Config { .expect("failed to get endpoint for service logs from dictionary"); Self { + service_name, primary_host, fallback_host, static_ttl, diff --git a/terragrunt/modules/crates-io/compute-static/src/log_line.rs b/terragrunt/modules/crates-io/compute-static/src/log_line.rs index 117128c9f..5c0858070 100644 --- a/terragrunt/modules/crates-io/compute-static/src/log_line.rs +++ b/terragrunt/modules/crates-io/compute-static/src/log_line.rs @@ -11,8 +11,13 @@ pub enum LogLine { V1(LogLineV1), } +// `source` and `service` are reserved log attributes on Datadog that have a special meaning. +// https://docs.datadoghq.com/logs/log_configuration/attributes_naming_convention #[derive(Debug, Builder, Serialize)] pub struct LogLineV1 { + #[builder(default = "default_source()")] + source: &'static str, + service: String, #[serde(with = "time::serde::rfc3339")] date_time: OffsetDateTime, url: String, @@ -21,3 +26,7 @@ pub struct LogLineV1 { method: Option, status: Option, } + +fn default_source() -> &'static str { + "fastly" +} diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs index 5a53df1c1..91988ca7c 100644 --- a/terragrunt/modules/crates-io/compute-static/src/main.rs +++ b/terragrunt/modules/crates-io/compute-static/src/main.rs @@ -24,7 +24,7 @@ fn main(request: Request) -> Result { } init_logging(&config); - let mut log = collect_request(&request); + let mut log = collect_request(&config, &request); let has_origin_header = request.get_header("Origin").is_some(); let mut response = handle_request(&config, request); @@ -55,8 +55,9 @@ fn init_logging(config: &Config) { } /// Collect data for the logs from the request -fn collect_request(request: &Request) -> LogLineV1Builder { +fn collect_request(config: &Config, request: &Request) -> LogLineV1Builder { LogLineV1Builder::default() + .service(config.service_name.clone()) .date_time(OffsetDateTime::now_utc()) .url(request.get_url_str().into()) .ip(request.get_client_ip_addr()) diff --git a/terragrunt/modules/crates-io/fastly-static.tf b/terragrunt/modules/crates-io/fastly-static.tf index b3fc13b3c..78fc736b7 100644 --- a/terragrunt/modules/crates-io/fastly-static.tf +++ b/terragrunt/modules/crates-io/fastly-static.tf @@ -99,6 +99,7 @@ resource "fastly_service_dictionary_items" "compute_static" { "cloudfront-url" : local.cloudfront_domain_name "s3-primary-host" : local.primary_host_name "s3-fallback-host" : local.fallback_host_name + "service-name": var.static_domain_name "static-ttl" : var.static_ttl "request-logs-endpoint" : local.request_logs_endpoint "service-logs-endpoint" : local.service_logs_endpoint From 91a4e110cb1eb5f25741d371500195de4888cb11 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 27 Feb 2024 15:50:59 +0100 Subject: [PATCH 019/217] Send request logs to Datadog and S3 The logging implementation for the Compute@Edge service on Fastly has been refactored so that logs can be sent to both S3 for long-term storage and Datadog for real-time analysis. --- terragrunt/modules/crates-io/_terraform.tf | 8 +++++ .../crates-io/compute-static/src/config.rs | 32 ++++++++++++------- .../crates-io/compute-static/src/main.rs | 14 ++++++-- terragrunt/modules/crates-io/fastly-static.tf | 26 ++++++++++----- 4 files changed, 57 insertions(+), 23 deletions(-) diff --git a/terragrunt/modules/crates-io/_terraform.tf b/terragrunt/modules/crates-io/_terraform.tf index 5c8345f40..c209b44bc 100644 --- a/terragrunt/modules/crates-io/_terraform.tf +++ b/terragrunt/modules/crates-io/_terraform.tf @@ -108,3 +108,11 @@ variable "cdn_log_event_queue_arn" { description = "ARN of the SQS queue that receives S3 notifications for CDN logs" type = string } + +variable "env" { + type = string + validation { + condition = contains(["staging", "prod"], var.env) + error_message = "The environment must be 'staging' or 'prod'." + } +} diff --git a/terragrunt/modules/crates-io/compute-static/src/config.rs b/terragrunt/modules/crates-io/compute-static/src/config.rs index 1d608a85d..f4bfefea4 100644 --- a/terragrunt/modules/crates-io/compute-static/src/config.rs +++ b/terragrunt/modules/crates-io/compute-static/src/config.rs @@ -18,11 +18,14 @@ const FALLBACK_HOST: &str = "s3-fallback-host"; // Name of the dictionary item with the TTL for the static bucket const STATIC_TTL: &str = "static-ttl"; -// Name of the directory item with the logging endpoint for requests -const REQUEST_LOGS_ENDPOINT: &str = "request-logs-endpoint"; +// Name of the directory item with the Datadog logging endpoint for requests +const DATADOG_REQUEST_LOGS_ENDPOINT: &str = "datadog-request-logs-endpoint"; -// Name of the directory item with the logging endpoint for the worker -const SERVICE_LOGS_ENDPOINT: &str = "service-logs-endpoint"; +// Name of the directory item with the S3 logging endpoint for requests +const S3_REQUEST_LOGS_ENDPOINT: &str = "s3-request-logs-endpoint"; + +// Name of the directory item with the S3 logging endpoint for the worker +const S3_SERVICE_LOGS_ENDPOINT: &str = "s3-service-logs-endpoint"; #[derive(Debug)] pub struct Config { @@ -31,8 +34,9 @@ pub struct Config { pub fallback_host: String, pub static_ttl: u32, pub cloudfront_url: String, - pub request_logs_endpoint: String, - pub service_logs_endpoint: String, + pub datadog_request_logs_endpoint: String, + pub s3_request_logs_endpoint: String, + pub s3_service_logs_endpoint: String, } impl Config { @@ -63,11 +67,14 @@ impl Config { .expect("failed to get CloudFront URL from dictionary"); // Look up the endpoints for logging - let request_logs_endpoint = dictionary - .get(REQUEST_LOGS_ENDPOINT) + let datadog_request_logs_endpoint = dictionary + .get(DATADOG_REQUEST_LOGS_ENDPOINT) + .expect("failed to get endpoint for request logs from dictionary"); + let s3_request_logs_endpoint = dictionary + .get(S3_REQUEST_LOGS_ENDPOINT) .expect("failed to get endpoint for request logs from dictionary"); - let service_logs_endpoint = dictionary - .get(SERVICE_LOGS_ENDPOINT) + let s3_service_logs_endpoint = dictionary + .get(S3_SERVICE_LOGS_ENDPOINT) .expect("failed to get endpoint for service logs from dictionary"); Self { @@ -76,8 +83,9 @@ impl Config { fallback_host, static_ttl, cloudfront_url, - request_logs_endpoint, - service_logs_endpoint, + datadog_request_logs_endpoint, + s3_request_logs_endpoint, + s3_service_logs_endpoint, } } } diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs index 91988ca7c..7c28b2ecc 100644 --- a/terragrunt/modules/crates-io/compute-static/src/main.rs +++ b/terragrunt/modules/crates-io/compute-static/src/main.rs @@ -48,8 +48,8 @@ fn main(request: Request) -> Result { fn init_logging(config: &Config) { Logger::builder() .max_level(LevelFilter::Debug) - .endpoint(config.request_logs_endpoint.clone()) - .default_endpoint(config.service_logs_endpoint.clone()) + .endpoint(config.s3_request_logs_endpoint.clone()) + .default_endpoint(config.s3_service_logs_endpoint.clone()) .echo_stdout(true) .init(); } @@ -218,7 +218,15 @@ fn build_and_send_log(log_line: LogLineV1Builder, config: &Config) { match log_line.build() { Ok(log) => { let versioned_log = LogLine::V1(log); - info!(target: &config.request_logs_endpoint, "{}", json!(versioned_log).to_string()) + + [ + &config.datadog_request_logs_endpoint, + &config.s3_request_logs_endpoint, + ] + .iter() + .for_each(|endpoint| { + info!(target: endpoint, "{}", json!(versioned_log).to_string()); + }); } Err(error) => { warn!("failed to serialize request log: {error}"); diff --git a/terragrunt/modules/crates-io/fastly-static.tf b/terragrunt/modules/crates-io/fastly-static.tf index 78fc736b7..437deb6a8 100644 --- a/terragrunt/modules/crates-io/fastly-static.tf +++ b/terragrunt/modules/crates-io/fastly-static.tf @@ -6,8 +6,12 @@ locals { dictionary_name = "compute_static" - request_logs_endpoint = "s3-request-logs" - service_logs_endpoint = "s3-service-logs" + request_logs_endpoint = "request-logs" + service_logs_endpoint = "service-logs" +} + +data "aws_ssm_parameter" "datadog_token" { + name = "/${var.env}/crates-io/fastly/datadog-token" } data "external" "package" { @@ -64,7 +68,7 @@ resource "fastly_service_compute" "static" { } logging_s3 { - name = local.request_logs_endpoint + name = "s3-${local.request_logs_endpoint}" bucket_name = aws_s3_bucket.logs.bucket s3_iam_role = aws_iam_role.fastly_assume_role.arn @@ -75,7 +79,7 @@ resource "fastly_service_compute" "static" { } logging_s3 { - name = local.service_logs_endpoint + name = "s3-${local.service_logs_endpoint}" bucket_name = aws_s3_bucket.logs.bucket s3_iam_role = aws_iam_role.fastly_assume_role.arn @@ -84,6 +88,11 @@ resource "fastly_service_compute" "static" { compression_codec = "zstd" } + + logging_datadog { + name = "datadog-${local.request_logs_endpoint}" + token = data.aws_ssm_parameter.datadog_token.value + } } resource "fastly_service_dictionary_items" "compute_static" { @@ -97,12 +106,13 @@ resource "fastly_service_dictionary_items" "compute_static" { items = { "cloudfront-url" : local.cloudfront_domain_name - "s3-primary-host" : local.primary_host_name + "datadog-request-logs-endpoint" : "datadog-${local.request_logs_endpoint}" "s3-fallback-host" : local.fallback_host_name - "service-name": var.static_domain_name + "s3-primary-host" : local.primary_host_name + "s3-request-logs-endpoint" : "s3-${local.request_logs_endpoint}" + "s3-service-logs-endpoint" : "s3-${local.service_logs_endpoint}" + "service-name" : var.static_domain_name "static-ttl" : var.static_ttl - "request-logs-endpoint" : local.request_logs_endpoint - "service-logs-endpoint" : local.service_logs_endpoint } } From bfcd9ef71ffc7fbad3e7cbe96b3c76120cf87296 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 27 Feb 2024 16:24:25 +0100 Subject: [PATCH 020/217] Update Terragrunt configuration with environment The environment is now passed to the Terraform module as a variable. This also makes it possible to dynamically derive the SSM parameter for the customer ID, which was previously hard-coded. --- .../accounts/legacy/crates-io-prod/crates-io/terragrunt.hcl | 4 ++-- .../legacy/crates-io-staging/crates-io/terragrunt.hcl | 4 ++-- terragrunt/modules/crates-io/_terraform.tf | 5 ----- terragrunt/modules/crates-io/fastly-iam-role.tf | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/terragrunt/accounts/legacy/crates-io-prod/crates-io/terragrunt.hcl b/terragrunt/accounts/legacy/crates-io-prod/crates-io/terragrunt.hcl index e22dec1ae..d32b5332e 100644 --- a/terragrunt/accounts/legacy/crates-io-prod/crates-io/terragrunt.hcl +++ b/terragrunt/accounts/legacy/crates-io-prod/crates-io/terragrunt.hcl @@ -8,6 +8,8 @@ include { } inputs = { + env = "prod" + webapp_domain_name = "crates.io" static_domain_name = "static.crates.io" index_domain_name = "index.crates.io" @@ -27,7 +29,5 @@ inputs = { static_cloudfront_weight = 5 static_fastly_weight = 95 - fastly_customer_id_ssm_parameter = "/prod/crates-io/fastly/customer-id" - cdn_log_event_queue_arn = "arn:aws:sqs:us-west-1:365596307002:cdn-log-event-queue" } diff --git a/terragrunt/accounts/legacy/crates-io-staging/crates-io/terragrunt.hcl b/terragrunt/accounts/legacy/crates-io-staging/crates-io/terragrunt.hcl index 28d9ac604..6a3916bea 100644 --- a/terragrunt/accounts/legacy/crates-io-staging/crates-io/terragrunt.hcl +++ b/terragrunt/accounts/legacy/crates-io-staging/crates-io/terragrunt.hcl @@ -8,6 +8,8 @@ include { } inputs = { + env = "staging" + webapp_domain_name = "staging.crates.io" static_domain_name = "static.staging.crates.io" index_domain_name = "index.staging.crates.io" @@ -26,7 +28,5 @@ inputs = { static_cloudfront_weight = 0 static_fastly_weight = 100 - fastly_customer_id_ssm_parameter = "/staging/crates-io/fastly/customer-id" - cdn_log_event_queue_arn = "arn:aws:sqs:us-west-1:359172468976:cdn-log-event-queue" } diff --git a/terragrunt/modules/crates-io/_terraform.tf b/terragrunt/modules/crates-io/_terraform.tf index c209b44bc..c449bd953 100644 --- a/terragrunt/modules/crates-io/_terraform.tf +++ b/terragrunt/modules/crates-io/_terraform.tf @@ -92,11 +92,6 @@ variable "static_fastly_weight" { type = number } -variable "fastly_customer_id_ssm_parameter" { - description = "Name of the SSM parameter with our Fastly customer id" - type = string -} - variable "fastly_aws_account_id" { # See https://docs.fastly.com/en/guides/creating-an-aws-iam-role-for-fastly-logging description = "The AWS account ID that Fastly uses to write logs" diff --git a/terragrunt/modules/crates-io/fastly-iam-role.tf b/terragrunt/modules/crates-io/fastly-iam-role.tf index 1b80a2453..2b09e857a 100644 --- a/terragrunt/modules/crates-io/fastly-iam-role.tf +++ b/terragrunt/modules/crates-io/fastly-iam-role.tf @@ -1,5 +1,5 @@ data "aws_ssm_parameter" "fastly_customer_id" { - name = var.fastly_customer_id_ssm_parameter + name = "/${var.env}/crates-io/fastly/customer-id" } resource "aws_iam_role" "fastly_assume_role" { From 194f38153fffad698f53c5568c9685abed55e407 Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 28 Feb 2024 01:07:18 +0100 Subject: [PATCH 021/217] Add unified tags to Fastly logs Datadog has a concept called unified service tagging[^1] that connects data across different parts of the platform. We have added more tags to each log to make use of this feature. [^1]: https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging --- .../crates-io/compute-static/src/config.rs | 44 ++++++++++++++----- .../crates-io/compute-static/src/log_line.rs | 3 ++ .../crates-io/compute-static/src/main.rs | 5 ++- terragrunt/modules/crates-io/fastly-static.tf | 5 ++- 4 files changed, 45 insertions(+), 12 deletions(-) diff --git a/terragrunt/modules/crates-io/compute-static/src/config.rs b/terragrunt/modules/crates-io/compute-static/src/config.rs index f4bfefea4..2b112212e 100644 --- a/terragrunt/modules/crates-io/compute-static/src/config.rs +++ b/terragrunt/modules/crates-io/compute-static/src/config.rs @@ -6,9 +6,6 @@ const DICTIONARY_NAME: &str = "compute_static"; // Name of the dictionary item with the CloudFront URL const CLOUDFRONT_URL: &str = "cloudfront-url"; -// Name of the dictionary item with the name of the service. -const SERVICE_NAME: &str = "service-name"; - // Name of the dictionary item with the name of the primary host. const PRIMARY_HOST: &str = "s3-primary-host"; @@ -18,9 +15,21 @@ const FALLBACK_HOST: &str = "s3-fallback-host"; // Name of the dictionary item with the TTL for the static bucket const STATIC_TTL: &str = "static-ttl"; +// Name of the directory item with the Datadog app tag +const DATADOG_APP: &str = "datadog-app"; + +// Name of the directory item with the Datadog environment tag +const DATADOG_ENV: &str = "datadog-env"; + +// Name of the directory item with the Datadog host tag +const DATADOG_HOST: &str = "datadog-host"; + // Name of the directory item with the Datadog logging endpoint for requests const DATADOG_REQUEST_LOGS_ENDPOINT: &str = "datadog-request-logs-endpoint"; +// Name of the directory item with the Datadog service tag +const DATADOG_SERVICE: &str = "datadog-service"; + // Name of the directory item with the S3 logging endpoint for requests const S3_REQUEST_LOGS_ENDPOINT: &str = "s3-request-logs-endpoint"; @@ -29,12 +38,15 @@ const S3_SERVICE_LOGS_ENDPOINT: &str = "s3-service-logs-endpoint"; #[derive(Debug)] pub struct Config { - pub service_name: String, pub primary_host: String, pub fallback_host: String, pub static_ttl: u32, pub cloudfront_url: String, + pub datadog_app: String, + pub datadog_env: String, + pub datadog_host: String, pub datadog_request_logs_endpoint: String, + pub datadog_service: String, pub s3_request_logs_endpoint: String, pub s3_service_logs_endpoint: String, } @@ -43,11 +55,6 @@ impl Config { pub fn from_dictionary() -> Self { let dictionary = ConfigStore::open(DICTIONARY_NAME); - // Look up the name of the service - let service_name = dictionary - .get(SERVICE_NAME) - .expect("failed to get service name from dictionary"); - // Look up S3 hosts for current environment let primary_host = dictionary .get(PRIMARY_HOST) @@ -77,13 +84,30 @@ impl Config { .get(S3_SERVICE_LOGS_ENDPOINT) .expect("failed to get endpoint for service logs from dictionary"); + // Look up the tags for Datadog + let datadog_app = dictionary + .get(DATADOG_APP) + .expect("failed to get Datadog app tag from dictionary"); + let datadog_env = dictionary + .get(DATADOG_ENV) + .expect("failed to get Datadog environment tag from dictionary"); + let datadog_host = dictionary + .get(DATADOG_HOST) + .expect("failed to get Datadog host tag from dictionary"); + let datadog_service = dictionary + .get(DATADOG_SERVICE) + .expect("failed to get Datadog service tag from dictionary"); + Self { - service_name, primary_host, fallback_host, static_ttl, cloudfront_url, + datadog_app, + datadog_env, + datadog_host, datadog_request_logs_endpoint, + datadog_service, s3_request_logs_endpoint, s3_service_logs_endpoint, } diff --git a/terragrunt/modules/crates-io/compute-static/src/log_line.rs b/terragrunt/modules/crates-io/compute-static/src/log_line.rs index 5c0858070..ec7e9fada 100644 --- a/terragrunt/modules/crates-io/compute-static/src/log_line.rs +++ b/terragrunt/modules/crates-io/compute-static/src/log_line.rs @@ -17,7 +17,10 @@ pub enum LogLine { pub struct LogLineV1 { #[builder(default = "default_source()")] source: &'static str, + app: String, service: String, + env: String, + host: String, #[serde(with = "time::serde::rfc3339")] date_time: OffsetDateTime, url: String, diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs index 7c28b2ecc..767b23e00 100644 --- a/terragrunt/modules/crates-io/compute-static/src/main.rs +++ b/terragrunt/modules/crates-io/compute-static/src/main.rs @@ -57,7 +57,10 @@ fn init_logging(config: &Config) { /// Collect data for the logs from the request fn collect_request(config: &Config, request: &Request) -> LogLineV1Builder { LogLineV1Builder::default() - .service(config.service_name.clone()) + .app(config.datadog_app.clone()) + .service(config.datadog_service.clone()) + .env(config.datadog_env.clone()) + .host(config.datadog_host.clone()) .date_time(OffsetDateTime::now_utc()) .url(request.get_url_str().into()) .ip(request.get_client_ip_addr()) diff --git a/terragrunt/modules/crates-io/fastly-static.tf b/terragrunt/modules/crates-io/fastly-static.tf index 437deb6a8..45c13290b 100644 --- a/terragrunt/modules/crates-io/fastly-static.tf +++ b/terragrunt/modules/crates-io/fastly-static.tf @@ -106,12 +106,15 @@ resource "fastly_service_dictionary_items" "compute_static" { items = { "cloudfront-url" : local.cloudfront_domain_name + "datadog-app" : "crates.io" + "datadog-env" : var.env + "datadog-host" : var.static_domain_name "datadog-request-logs-endpoint" : "datadog-${local.request_logs_endpoint}" + "datadog-service" : "static.crates.io" "s3-fallback-host" : local.fallback_host_name "s3-primary-host" : local.primary_host_name "s3-request-logs-endpoint" : "s3-${local.request_logs_endpoint}" "s3-service-logs-endpoint" : "s3-${local.service_logs_endpoint}" - "service-name" : var.static_domain_name "static-ttl" : var.static_ttl } } From c3badd1c5cca64d4c511cb4e171b46f875b898de Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 28 Feb 2024 11:48:25 +0100 Subject: [PATCH 022/217] Try a different format for Datadog tags --- .../modules/crates-io/compute-static/src/log_line.rs | 7 +++---- terragrunt/modules/crates-io/compute-static/src/main.rs | 8 +++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/terragrunt/modules/crates-io/compute-static/src/log_line.rs b/terragrunt/modules/crates-io/compute-static/src/log_line.rs index ec7e9fada..cc4040feb 100644 --- a/terragrunt/modules/crates-io/compute-static/src/log_line.rs +++ b/terragrunt/modules/crates-io/compute-static/src/log_line.rs @@ -16,11 +16,10 @@ pub enum LogLine { #[derive(Debug, Builder, Serialize)] pub struct LogLineV1 { #[builder(default = "default_source()")] - source: &'static str, - app: String, + ddsource: &'static str, + ddtags: String, service: String, - env: String, - host: String, + hostname: String, #[serde(with = "time::serde::rfc3339")] date_time: OffsetDateTime, url: String, diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs index 767b23e00..40c0ee3dc 100644 --- a/terragrunt/modules/crates-io/compute-static/src/main.rs +++ b/terragrunt/modules/crates-io/compute-static/src/main.rs @@ -57,10 +57,12 @@ fn init_logging(config: &Config) { /// Collect data for the logs from the request fn collect_request(config: &Config, request: &Request) -> LogLineV1Builder { LogLineV1Builder::default() - .app(config.datadog_app.clone()) .service(config.datadog_service.clone()) - .env(config.datadog_env.clone()) - .host(config.datadog_host.clone()) + .hostname(config.datadog_host.clone()) + .ddtags(format!( + "app:{},env:{}", + config.datadog_app, config.datadog_env + )) .date_time(OffsetDateTime::now_utc()) .url(request.get_url_str().into()) .ip(request.get_client_ip_addr()) From c69513754202a53075b092d1279a2561bc407463 Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 28 Feb 2024 11:59:01 +0100 Subject: [PATCH 023/217] Register logging endpoint for Datadog --- terragrunt/modules/crates-io/compute-static/src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs index 40c0ee3dc..10124e10e 100644 --- a/terragrunt/modules/crates-io/compute-static/src/main.rs +++ b/terragrunt/modules/crates-io/compute-static/src/main.rs @@ -48,6 +48,7 @@ fn main(request: Request) -> Result { fn init_logging(config: &Config) { Logger::builder() .max_level(LevelFilter::Debug) + .endpoint(config.datadog_request_logs_endpoint.clone()) .endpoint(config.s3_request_logs_endpoint.clone()) .default_endpoint(config.s3_service_logs_endpoint.clone()) .echo_stdout(true) From 3311825fe62b84912fcd5ea399d884a296cf477c Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 7 Mar 2024 19:59:35 +0100 Subject: [PATCH 024/217] Extend the log with more information The prior version of the log was very barebones, which was fine for capturing the requested URLs, but insufficient to debug the service. The extended log format includes more information about the client, protocols, and Fastly service. --- .../crates-io/compute-static/src/log_line.rs | 29 ++++++++-- .../crates-io/compute-static/src/main.rs | 57 ++++++++++++++++--- 2 files changed, 72 insertions(+), 14 deletions(-) diff --git a/terragrunt/modules/crates-io/compute-static/src/log_line.rs b/terragrunt/modules/crates-io/compute-static/src/log_line.rs index cc4040feb..e100bad6b 100644 --- a/terragrunt/modules/crates-io/compute-static/src/log_line.rs +++ b/terragrunt/modules/crates-io/compute-static/src/log_line.rs @@ -11,24 +11,41 @@ pub enum LogLine { V1(LogLineV1), } -// `source` and `service` are reserved log attributes on Datadog that have a special meaning. -// https://docs.datadoghq.com/logs/log_configuration/attributes_naming_convention +// `ddsource`, `ddtags`, and `service` are reserved log attributes on Datadog that have a special +// meaning. See https://docs.datadoghq.com/logs/log_configuration/attributes_naming_convention. #[derive(Debug, Builder, Serialize)] pub struct LogLineV1 { #[builder(default = "default_source()")] ddsource: &'static str, ddtags: String, service: String, - hostname: String, + bytes: Option, + content_type: Option, #[serde(with = "time::serde::rfc3339")] date_time: OffsetDateTime, - url: String, - bytes: Option, + edge_location: Option, + host: Option, + http: Option, ip: Option, - method: Option, status: Option, + tls: Option, + url: String, } fn default_source() -> &'static str { "fastly" } + +#[derive(Clone, Debug, Builder, Serialize)] +pub struct HttpDetails { + method: String, + protocol: Option, + referer: Option, + useragent: Option, +} + +#[derive(Clone, Debug, Builder, Serialize)] +pub struct TlsDetails { + cipher: Option<&'static str>, + protocol: Option<&'static str>, +} diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs index 10124e10e..6dac3c294 100644 --- a/terragrunt/modules/crates-io/compute-static/src/main.rs +++ b/terragrunt/modules/crates-io/compute-static/src/main.rs @@ -1,14 +1,15 @@ -use fastly::http::{Method, StatusCode}; +use fastly::http::{Method, StatusCode, Version}; use fastly::{Error, Request, Response}; use log::{info, warn, LevelFilter}; use log_fastly::Logger; use once_cell::sync::Lazy; use regex::Regex; use serde_json::json; +use std::env::var; use time::OffsetDateTime; use crate::config::Config; -use crate::log_line::{LogLine, LogLineV1Builder}; +use crate::log_line::{HttpDetailsBuilder, LogLine, LogLineV1Builder, TlsDetailsBuilder}; mod config; mod log_line; @@ -57,18 +58,46 @@ fn init_logging(config: &Config) { /// Collect data for the logs from the request fn collect_request(config: &Config, request: &Request) -> LogLineV1Builder { - LogLineV1Builder::default() - .service(config.datadog_service.clone()) - .hostname(config.datadog_host.clone()) + let http_details = HttpDetailsBuilder::default() + .method(request.get_method().to_string()) + .protocol(http_version_to_string(request.get_version())) + .referer( + request + .get_header("Referer") + .and_then(|s| s.to_str().ok()) + .map(|s| s.to_string()), + ) + .useragent( + request + .get_header("User-Agent") + .and_then(|s| s.to_str().ok()) + .map(|s| s.to_string()), + ) + .build() + .ok(); + + let tls_details = TlsDetailsBuilder::default() + .cipher(request.get_tls_cipher_openssl_name()) + .protocol(request.get_tls_protocol()) + .build() + .ok(); + + let log_line = LogLineV1Builder::default() .ddtags(format!( "app:{},env:{}", config.datadog_app, config.datadog_env )) + .service(config.datadog_service.clone()) .date_time(OffsetDateTime::now_utc()) - .url(request.get_url_str().into()) + .edge_location(var("FASTLY_POP").ok()) + .host(request.get_url().host().map(|s| s.to_string())) + .http(http_details) .ip(request.get_client_ip_addr()) - .method(Some(request.get_method().to_string())) - .to_owned() + .url(request.get_url_str().into()) + .tls(tls_details) + .to_owned(); + + log_line } /// Handle the request @@ -212,6 +241,7 @@ fn collect_response( if let Ok(response) = response { log_line .bytes(response.get_content_length()) + .content_type(response.get_content_type().map(|s| s.to_string())) .status(Some(response.get_status().as_u16())) .to_owned() } else { @@ -240,6 +270,17 @@ fn build_and_send_log(log_line: LogLineV1Builder, config: &Config) { }; } +fn http_version_to_string(version: Version) -> Option { + match version { + Version::HTTP_09 => Some("HTTP/0.9".into()), + Version::HTTP_10 => Some("HTTP/1.0".into()), + Version::HTTP_11 => Some("HTTP/1.1".into()), + Version::HTTP_2 => Some("HTTP/2".into()), + Version::HTTP_3 => Some("HTTP/3".into()), + _ => None, + } +} + #[cfg(test)] mod tests { use super::*; From 4bed150d5f730ed3379e2b998c70b5e815fd6ce5 Mon Sep 17 00:00:00 2001 From: Jan David Date: Fri, 8 Mar 2024 10:29:14 +0100 Subject: [PATCH 025/217] Avoid breaking change in log format --- terragrunt/modules/crates-io/compute-static/src/log_line.rs | 2 +- terragrunt/modules/crates-io/compute-static/src/main.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terragrunt/modules/crates-io/compute-static/src/log_line.rs b/terragrunt/modules/crates-io/compute-static/src/log_line.rs index e100bad6b..cdd12a07a 100644 --- a/terragrunt/modules/crates-io/compute-static/src/log_line.rs +++ b/terragrunt/modules/crates-io/compute-static/src/log_line.rs @@ -27,6 +27,7 @@ pub struct LogLineV1 { host: Option, http: Option, ip: Option, + method: Option, status: Option, tls: Option, url: String, @@ -38,7 +39,6 @@ fn default_source() -> &'static str { #[derive(Clone, Debug, Builder, Serialize)] pub struct HttpDetails { - method: String, protocol: Option, referer: Option, useragent: Option, diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs index 6dac3c294..deebd35b2 100644 --- a/terragrunt/modules/crates-io/compute-static/src/main.rs +++ b/terragrunt/modules/crates-io/compute-static/src/main.rs @@ -59,7 +59,6 @@ fn init_logging(config: &Config) { /// Collect data for the logs from the request fn collect_request(config: &Config, request: &Request) -> LogLineV1Builder { let http_details = HttpDetailsBuilder::default() - .method(request.get_method().to_string()) .protocol(http_version_to_string(request.get_version())) .referer( request @@ -93,6 +92,7 @@ fn collect_request(config: &Config, request: &Request) -> LogLineV1Builder { .host(request.get_url().host().map(|s| s.to_string())) .http(http_details) .ip(request.get_client_ip_addr()) + .method(Some(request.get_method().to_string())) .url(request.get_url_str().into()) .tls(tls_details) .to_owned(); From 1fc9d81b88cac2db45577360a3e114bd9ec2625c Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 13 Mar 2024 15:15:48 +0100 Subject: [PATCH 026/217] Refactor team member module for Datadog --- terraform/team-members-datadog/crates-io.tf | 10 +--- .../team-members-datadog/foundation-board.tf | 15 ++---- terraform/team-members-datadog/foundation.tf | 30 +++-------- .../team-members-datadog/infra-admins.tf | 30 +++-------- terraform/team-members-datadog/users.tf | 51 +++++++++++++++++++ 5 files changed, 68 insertions(+), 68 deletions(-) diff --git a/terraform/team-members-datadog/crates-io.tf b/terraform/team-members-datadog/crates-io.tf index 64d0d6f82..19d46fd6d 100644 --- a/terraform/team-members-datadog/crates-io.tf +++ b/terraform/team-members-datadog/crates-io.tf @@ -1,13 +1,7 @@ locals { crates_io = { - "adam" = { - login = "adamharvey@rustfoundation.org" - name = "Adam Harvey" - } - "tobias" = { - login = "tobiasbieniek@rustfoundation.org" - name = "Tobias Bieniek" - } + "adam" = local.users.adam + "tobias" = local.users.tobias } } diff --git a/terraform/team-members-datadog/foundation-board.tf b/terraform/team-members-datadog/foundation-board.tf index cc197d704..ddbbe0599 100644 --- a/terraform/team-members-datadog/foundation-board.tf +++ b/terraform/team-members-datadog/foundation-board.tf @@ -1,17 +1,8 @@ locals { foundation_board = { - "nell" = { - login = "nells@microsoft.com" - name = "Nell Shamrell-Harrington" - } - "peixin" = { - login = "peixin.hou@gmail.com" - name = "Peixin Hou" - } - "seth" = { - login = "smarkle.aws@gmail.com" - name = "Seth Markle" - } + "nell" = local.users.nell + "peixin" = local.users.peixin + "seth" = local.users.seth } } diff --git a/terraform/team-members-datadog/foundation.tf b/terraform/team-members-datadog/foundation.tf index e8a97fbce..3af19223c 100644 --- a/terraform/team-members-datadog/foundation.tf +++ b/terraform/team-members-datadog/foundation.tf @@ -1,29 +1,11 @@ locals { foundation = { - "adam" = { - login = "adamharvey@rustfoundation.org" - name = "Adam Harvey" - } - "jdn" = { - login = "jandavidnose@rustfoundation.org" - name = "Jan David Nose" - } - "joel" = { - login = "joelmarcey@rustfoundation.org" - name = "Joel Marcey" - } - "paullenz" = { - login = "paullenz@rustfoundation.org" - name = "Paul Lenz" - } - "rustfoundation" = { - login = "infra@rustfoundation.org" - name = "Rust Foundation Infrastructure" - } - "tobias" = { - login = "tobiasbieniek@rustfoundation.org" - name = "Tobias Bieniek" - } + "adam" = local.users.adam + "jdn" = local.users.jdn + "joel" = local.users.joel + "paullenz" = local.users.paullenz + "rustfoundation" = local.users.rustfoundation + "tobias" = local.users.tobias } } diff --git a/terraform/team-members-datadog/infra-admins.tf b/terraform/team-members-datadog/infra-admins.tf index 623a2e88c..c6919fedf 100644 --- a/terraform/team-members-datadog/infra-admins.tf +++ b/terraform/team-members-datadog/infra-admins.tf @@ -1,29 +1,11 @@ locals { infra_admins = { - "admin" = { - login = "admin@rust-lang.org" - name = "Rust Admin" - } - "jdn" = { - login = "jandavidnose@rustfoundation.org" - name = "Jan David Nose" - } - "joel" = { - login = "joelmarcey@rustfoundation.org" - name = "Joel Marcey" - } - "mark" = { - login = "mark.simulacrum@gmail.com" - name = "Mark Rousskov" - } - "pietro" = { - login = "pietro@pietroalbini.org" - name = "Pietro Albini" - } - "rustfoundation" = { - login = "infra@rustfoundation.org" - name = "Rust Foundation Infrastructure" - } + "admin" = local.users.admin + "jdn" = local.users.jdn + "joel" = local.users.joel + "mark" = local.users.mark + "pietro" = local.users.pietro + "rustfoundation" = local.users.rustfoundation } } diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index 0345bda58..85177be75 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -1,4 +1,55 @@ locals { + users = { + "adam" = { + login = "adamharvey@rustfoundation.org" + name = "Adam Harvey" + } + "admin" = { + login = "admin@rust-lang.org" + name = "Rust Admin" + } + "jdn" = { + login = "jandavidnose@rustfoundation.org" + name = "Jan David Nose" + } + "joel" = { + login = "joelmarcey@rustfoundation.org" + name = "Joel Marcey" + } + "mark" = { + login = "mark.simulacrum@gmail.com" + name = "Mark Rousskov" + } + "nell" = { + login = "nells@microsoft.com" + name = "Nell Shamrell-Harrington" + } + "paullenz" = { + login = "paullenz@rustfoundation.org" + name = "Paul Lenz" + } + "peixin" = { + login = "peixin.hou@gmail.com" + name = "Peixin Hou" + } + "pietro" = { + login = "pietro@pietroalbini.org" + name = "Pietro Albini" + } + "rustfoundation" = { + login = "infra@rustfoundation.org" + name = "Rust Foundation Infrastructure" + } + "seth" = { + login = "smarkle.aws@gmail.com" + name = "Seth Markle" + } + "tobias" = { + login = "tobiasbieniek@rustfoundation.org" + name = "Tobias Bieniek" + } + } + # This is a list of all users from all teams. When a user is part of multiple teams, this list will contain multiple # entries for that user (one for each team). These entries will have different roles. # From 98bc9409c2c4fc408e1969e45401306601eb07bb Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 20 Mar 2024 16:02:46 +0100 Subject: [PATCH 027/217] Create Datadog account for Jakub --- terraform/team-members-datadog/infra.tf | 40 +++++++++++++++++++++++++ terraform/team-members-datadog/users.tf | 5 ++++ 2 files changed, 45 insertions(+) create mode 100644 terraform/team-members-datadog/infra.tf diff --git a/terraform/team-members-datadog/infra.tf b/terraform/team-members-datadog/infra.tf new file mode 100644 index 000000000..a0b96e35d --- /dev/null +++ b/terraform/team-members-datadog/infra.tf @@ -0,0 +1,40 @@ +locals { + infra = { + "admin" = local.users.admin + "jakub" = local.users.jakub + "jdn" = local.users.jdn + "mark" = local.users.mark + "pietro" = local.users.pietro + } +} + +resource "datadog_role" "infra" { + name = "infra" + + dynamic "permission" { + for_each = toset([ + data.datadog_permissions.all.permissions.logs_read_index_data, + data.datadog_permissions.all.permissions.logs_read_data, + data.datadog_permissions.all.permissions.logs_live_tail, + data.datadog_permissions.all.permissions.logs_read_archives, + data.datadog_permissions.all.permissions.dashboards_write, + ]) + + content { + id = permission.value + } + } +} + +resource "datadog_team" "infra" { + name = "infra-team" + description = "The infra-team" + handle = "infra" +} + +resource "datadog_team_membership" "infra" { + for_each = local.infra + + team_id = datadog_team.infra.id + user_id = datadog_user.users[each.key].id +} diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index 85177be75..296223140 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -8,6 +8,10 @@ locals { login = "admin@rust-lang.org" name = "Rust Admin" } + "jakub" = { + login = "berykubik@gmail.com" + name = "Jakub Beránek" + } "jdn" = { login = "jandavidnose@rustfoundation.org" name = "Jan David Nose" @@ -64,6 +68,7 @@ locals { { for name, user in local.crates_io : name => merge(user, { roles = [datadog_role.crates_io.name] }) }, { for name, user in local.foundation : name => merge(user, { roles = [datadog_role.foundation.name] }) }, { for name, user in local.foundation_board : name => merge(user, { roles = [datadog_role.board_member.name] }) }, + { for name, user in local.infra : name => merge(user, { roles = [datadog_role.infra.name] }) }, { for name, user in local.infra_admins : name => merge(user, { roles = ["Datadog Admin Role"] }) }, ] From ed4f1c3b423290f64d010c47005b357b98dc9b14 Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 20 Mar 2024 16:03:41 +0100 Subject: [PATCH 028/217] Document how to add users and teams --- terraform/team-members-datadog/README.md | 49 ++++++++++++++++++++---- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/terraform/team-members-datadog/README.md b/terraform/team-members-datadog/README.md index 3ac48af64..85cf4a4ea 100644 --- a/terraform/team-members-datadog/README.md +++ b/terraform/team-members-datadog/README.md @@ -3,13 +3,6 @@ This Terraform configuration manages user accounts on Datadog. When a user is added to [`users.tf`](users.tf), they get invited to join our Datadog account. -## Roles - -Datadog uses _roles_ to manage who can do what on the platform. - -Members of the infra-admins team are assigned the `Datadog Admin Role` role. -Members of other teams get the `Datadog Standard Role` role. - ## Usage Applying the Terraform configuration requires an API key as well as an app key. @@ -21,4 +14,46 @@ export DD_APP_KEY="datadog-app-key" terraform plan ``` +### Add a user + +Adding a user is a two-step process. First, add the user to the `users.tf` file. +Then, add them to their respective team, referencing the user in `users.tf`. + +For example, `jdn` has first been added as a users in `users.tf`: + +```hcl +locals { + users = { + "jdn" = { + // ... + } + } +} +``` + +And then to the `infra` team in `infra.tf`: + +```hcl +locals { + infra = { + "jdn" = local.users.jdn + } +} +``` + +### Add a Team + +The easiest way to add a team is to copy an existing team and update its +resources. Go through the following steps before applying the configuration: + +1. At the top of the file, update the `locals` block to include the correct team + members. +2. Then update the `datadog_role` for the team and assign the appropriate + permissions to the team. +3. Update the `datadog_team` with the proper name and description. + +Then, register the team in `users.tf` in the `_do_not_use_all_teams` local. +Without this step, no team memberships will be assigned and users won't be +created. + [api-keys]: https://app.datadoghq.com/organization-settings/api-keys From f30697dc6733d0ee59d8d43b4832aa3542b7cecb Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Fri, 5 Apr 2024 09:33:30 -0400 Subject: [PATCH 029/217] Allow new-bors to promote artifacts to rustc-builds This lets us use the built artifacts in tooling (e.g. perf, crater), paving the way for starting to move towards new bors by default. --- terraform/rustc-ci/impl/artifacts.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/terraform/rustc-ci/impl/artifacts.tf b/terraform/rustc-ci/impl/artifacts.tf index c1e1ebd27..aae372365 100644 --- a/terraform/rustc-ci/impl/artifacts.tf +++ b/terraform/rustc-ci/impl/artifacts.tf @@ -180,10 +180,10 @@ resource "aws_iam_role" "try_builds" { Sid = "ArtifactsBucketWrite" Effect = "Allow" Resource = [ - "${aws_s3_bucket.artifacts.arn}/rustc-builds-try", - "${aws_s3_bucket.artifacts.arn}/rustc-builds-try/*", - "${aws_s3_bucket.artifacts.arn}/rustc-builds-try-alt", - "${aws_s3_bucket.artifacts.arn}/rustc-builds-try-alt/*", + "${aws_s3_bucket.artifacts.arn}/rustc-builds", + "${aws_s3_bucket.artifacts.arn}/rustc-builds/*", + "${aws_s3_bucket.artifacts.arn}/rustc-builds-alt", + "${aws_s3_bucket.artifacts.arn}/rustc-builds-alt/*", ] Action = [ "s3:GetObject", From 6d48c3394de64f28d145cc88dd2b98824a2b456f Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 9 Apr 2024 16:53:14 +0200 Subject: [PATCH 030/217] Move hard-coded constants into Compute@Edge module In an effort to simplify the configuration of both the Terraform and Rust modules, some hard-coded constants have been moved into the Compute@Edge module. This makes it possible to remove the glue code to pass them from the Terraform configuration to the final WASM function. While this does introduce some duplication, it removes a lot of complexity and potential configuration issues. --- .../crates-io/compute-static/src/config.rs | 16 ---------------- .../crates-io/compute-static/src/log_line.rs | 2 +- .../modules/crates-io/compute-static/src/main.rs | 10 +++++----- terragrunt/modules/crates-io/fastly-static.tf | 2 -- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/terragrunt/modules/crates-io/compute-static/src/config.rs b/terragrunt/modules/crates-io/compute-static/src/config.rs index 2b112212e..5293232b6 100644 --- a/terragrunt/modules/crates-io/compute-static/src/config.rs +++ b/terragrunt/modules/crates-io/compute-static/src/config.rs @@ -15,9 +15,6 @@ const FALLBACK_HOST: &str = "s3-fallback-host"; // Name of the dictionary item with the TTL for the static bucket const STATIC_TTL: &str = "static-ttl"; -// Name of the directory item with the Datadog app tag -const DATADOG_APP: &str = "datadog-app"; - // Name of the directory item with the Datadog environment tag const DATADOG_ENV: &str = "datadog-env"; @@ -27,9 +24,6 @@ const DATADOG_HOST: &str = "datadog-host"; // Name of the directory item with the Datadog logging endpoint for requests const DATADOG_REQUEST_LOGS_ENDPOINT: &str = "datadog-request-logs-endpoint"; -// Name of the directory item with the Datadog service tag -const DATADOG_SERVICE: &str = "datadog-service"; - // Name of the directory item with the S3 logging endpoint for requests const S3_REQUEST_LOGS_ENDPOINT: &str = "s3-request-logs-endpoint"; @@ -42,11 +36,9 @@ pub struct Config { pub fallback_host: String, pub static_ttl: u32, pub cloudfront_url: String, - pub datadog_app: String, pub datadog_env: String, pub datadog_host: String, pub datadog_request_logs_endpoint: String, - pub datadog_service: String, pub s3_request_logs_endpoint: String, pub s3_service_logs_endpoint: String, } @@ -85,29 +77,21 @@ impl Config { .expect("failed to get endpoint for service logs from dictionary"); // Look up the tags for Datadog - let datadog_app = dictionary - .get(DATADOG_APP) - .expect("failed to get Datadog app tag from dictionary"); let datadog_env = dictionary .get(DATADOG_ENV) .expect("failed to get Datadog environment tag from dictionary"); let datadog_host = dictionary .get(DATADOG_HOST) .expect("failed to get Datadog host tag from dictionary"); - let datadog_service = dictionary - .get(DATADOG_SERVICE) - .expect("failed to get Datadog service tag from dictionary"); Self { primary_host, fallback_host, static_ttl, cloudfront_url, - datadog_app, datadog_env, datadog_host, datadog_request_logs_endpoint, - datadog_service, s3_request_logs_endpoint, s3_service_logs_endpoint, } diff --git a/terragrunt/modules/crates-io/compute-static/src/log_line.rs b/terragrunt/modules/crates-io/compute-static/src/log_line.rs index cdd12a07a..0604c615e 100644 --- a/terragrunt/modules/crates-io/compute-static/src/log_line.rs +++ b/terragrunt/modules/crates-io/compute-static/src/log_line.rs @@ -18,7 +18,7 @@ pub struct LogLineV1 { #[builder(default = "default_source()")] ddsource: &'static str, ddtags: String, - service: String, + service: &'static str, bytes: Option, content_type: Option, #[serde(with = "time::serde::rfc3339")] diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs index deebd35b2..3d7060502 100644 --- a/terragrunt/modules/crates-io/compute-static/src/main.rs +++ b/terragrunt/modules/crates-io/compute-static/src/main.rs @@ -14,6 +14,9 @@ use crate::log_line::{HttpDetailsBuilder, LogLine, LogLineV1Builder, TlsDetailsB mod config; mod log_line; +const DATADOG_APP: &str = "crates.io"; +const DATADOG_SERVICE: &str = "static.crates.io"; + #[fastly::main] fn main(request: Request) -> Result { let config = Config::from_dictionary(); @@ -82,11 +85,8 @@ fn collect_request(config: &Config, request: &Request) -> LogLineV1Builder { .ok(); let log_line = LogLineV1Builder::default() - .ddtags(format!( - "app:{},env:{}", - config.datadog_app, config.datadog_env - )) - .service(config.datadog_service.clone()) + .ddtags(format!("app:{},env:{}", DATADOG_APP, config.datadog_env)) + .service(DATADOG_SERVICE) .date_time(OffsetDateTime::now_utc()) .edge_location(var("FASTLY_POP").ok()) .host(request.get_url().host().map(|s| s.to_string())) diff --git a/terragrunt/modules/crates-io/fastly-static.tf b/terragrunt/modules/crates-io/fastly-static.tf index 45c13290b..528cef291 100644 --- a/terragrunt/modules/crates-io/fastly-static.tf +++ b/terragrunt/modules/crates-io/fastly-static.tf @@ -106,11 +106,9 @@ resource "fastly_service_dictionary_items" "compute_static" { items = { "cloudfront-url" : local.cloudfront_domain_name - "datadog-app" : "crates.io" "datadog-env" : var.env "datadog-host" : var.static_domain_name "datadog-request-logs-endpoint" : "datadog-${local.request_logs_endpoint}" - "datadog-service" : "static.crates.io" "s3-fallback-host" : local.fallback_host_name "s3-primary-host" : local.primary_host_name "s3-request-logs-endpoint" : "s3-${local.request_logs_endpoint}" From 5b029e7bfb47bbe616a7d01cabc85d6e6ed53f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevyn-Alexandre=20Par=C3=A9?= Date: Thu, 4 Apr 2024 16:45:33 -0400 Subject: [PATCH 031/217] Update cargo resolver version Calling cargo command into the project was giving this warning: ``` warning: virtual workspace defaulting to `resolver = "1"` despite one or more workspace members being on edition 2021 which implies `resolver = "2"` note: to keep the current resolver, specify `workspace.resolver = "1"` in the workspace root's manifest note: to use the edition 2021 resolver, specify `workspace.resolver = "2"` in the workspace root's manifest note: for more details see https://doc.rust-lang.org/cargo/reference/resolver.html#resolver-versions ``` The workspace.resolver is updated to version 2 and each crates set edition = 2021 --- Cargo.toml | 3 +++ ansible/roles/dev-desktop/files/team_login/Cargo.toml | 2 +- setup-deploy-keys/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3ae9e2d4e..8bcabea67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,7 @@ [workspace] +# Opt-in to the new feature resolver introduced in Rust 1.51 and Edition 2021. +# https://doc.rust-lang.org/cargo/reference/resolver.html#resolver-versions +resolver = "2" members = [ "setup-deploy-keys", "ansible/roles/dev-desktop/files/team_login", diff --git a/ansible/roles/dev-desktop/files/team_login/Cargo.toml b/ansible/roles/dev-desktop/files/team_login/Cargo.toml index 90269f521..2b57a9bb6 100644 --- a/ansible/roles/dev-desktop/files/team_login/Cargo.toml +++ b/ansible/roles/dev-desktop/files/team_login/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Oli Scherer "] -edition = "2018" +edition = "2021" name = "team_login" version = "0.1.0" diff --git a/setup-deploy-keys/Cargo.toml b/setup-deploy-keys/Cargo.toml index 01500d976..5d60e99e4 100644 --- a/setup-deploy-keys/Cargo.toml +++ b/setup-deploy-keys/Cargo.toml @@ -2,7 +2,7 @@ name = "setup-deploy-keys" version = "0.1.0" authors = ["Alex Crichton "] -edition = "2018" +edition = "2021" [[bin]] name = "deploy" From 695f27c37147d0df0932a0db0418933331b1c34d Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 10 Apr 2024 14:17:05 +0200 Subject: [PATCH 032/217] monitoring: Remove obsolete "cratesio/SlowDownloads" alerting rule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The crate downloads are no longer going through the crates.io API. Since this alerting rule is based on the crates.io API traffic, it no longer serves its purpose. Whether we can implement something similar based on the CDN traffic logs would probably have to be figured out by the infra team 😅 --- ansible/playbooks/monitoring.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ansible/playbooks/monitoring.yml b/ansible/playbooks/monitoring.yml index 98acf3293..c68c7d80a 100644 --- a/ansible/playbooks/monitoring.yml +++ b/ansible/playbooks/monitoring.yml @@ -189,12 +189,6 @@ labels: dispatch: pagerduty-cratesio - - alert: SlowDownloads - expr: histogram_quantile(0.99, sum by (le) (rate(cratesio_instance_response_times_bucket{job="cratesio_heroku_metrics",app="crates-io",endpoint="/api/v1/crates/:crate_id/:version/download"}[30s]))) >= 1 - for: 1m - labels: - dispatch: pagerduty-cratesio - - name: docsrs rules: - alert: DocsRsDown From 69d20bcfa3b321e3077ec3aa1e11b00efdea8eed Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 15 Feb 2024 16:44:00 +0100 Subject: [PATCH 033/217] Enable metadata for Fastly function again The collection of metadata was disabled in #387, because the metadata contained an unstable property that broke the change detection in Terraform. This issue has been resolved upstream by introducing buckets for the heap allocation size, which reduces the risk of changes in the metadata while preserving the usefulness of the property. See https://github.com/fastly/cli/pull/1130 for details on the buckets. --- .../crates-io/compute-static/bin/terraform-external-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/modules/crates-io/compute-static/bin/terraform-external-build.sh b/terragrunt/modules/crates-io/compute-static/bin/terraform-external-build.sh index e2d7c668e..1c5e2fd18 100755 --- a/terragrunt/modules/crates-io/compute-static/bin/terraform-external-build.sh +++ b/terragrunt/modules/crates-io/compute-static/bin/terraform-external-build.sh @@ -19,7 +19,7 @@ script_path=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd) project_path=$(cd "${script_path}" && cd ".." && pwd) project_name="${project_path##*/}" -cd "${project_path}" && fastly compute build --metadata-disable &>/dev/null +cd "${project_path}" && fastly compute build &>/dev/null # Return a valid JSON object that Terraform can consume echo "{\"path\": \"./${project_name}/pkg/compute-static.tar.gz\"}" From 7364d9b7c7156621413591ad58b51e8867432727 Mon Sep 17 00:00:00 2001 From: Jan David Date: Fri, 15 Mar 2024 15:54:46 +0100 Subject: [PATCH 034/217] Create AWS accounts for LawnGnome @LawnGnome is part of the crates-io team and needs access to the CDN logs as well as the SQS queue to debug and fix an issue with broken download counts on crates.io. --- terraform/team-members-access/_users.tf | 1 + terragrunt/accounts/root/aws-organization/terragrunt.hcl | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/terraform/team-members-access/_users.tf b/terraform/team-members-access/_users.tf index 8c048fda9..1c0be40e9 100644 --- a/terraform/team-members-access/_users.tf +++ b/terraform/team-members-access/_users.tf @@ -18,6 +18,7 @@ locals { "paullenz" = [aws_iam_group.foundation.name], "shepmaster" = [aws_iam_group.infra_deploy_playground.name, aws_iam_group.infra_team.name], "oli-obk" = [aws_iam_group.infra_deploy_staging_dev_desktop.name], + "LawnGnome" = [aws_iam_group.crates_io.name], } } diff --git a/terragrunt/accounts/root/aws-organization/terragrunt.hcl b/terragrunt/accounts/root/aws-organization/terragrunt.hcl index 288c76d43..439185540 100644 --- a/terragrunt/accounts/root/aws-organization/terragrunt.hcl +++ b/terragrunt/accounts/root/aws-organization/terragrunt.hcl @@ -63,5 +63,11 @@ inputs = { email = "tobias@bieniek.cloud" groups = ["crates-io"] } + "adam" = { + given_name = "Adam" + family_name = "Harvey" + email = "adam@adamharvey.name" + groups = ["crates-io"] + } } } From aa6fc5d562bc256a3b77fb7799dc20dfd5733aa3 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Thu, 18 Apr 2024 21:34:14 -0400 Subject: [PATCH 035/217] Update rds-instances to match current state, support aarch64 macOS --- terraform/rds-databases/.terraform.lock.hcl | 109 +++++++++----------- terraform/rds-databases/_terraform.tf | 2 +- terraform/rds-databases/instance.tf | 8 +- 3 files changed, 50 insertions(+), 69 deletions(-) diff --git a/terraform/rds-databases/.terraform.lock.hcl b/terraform/rds-databases/.terraform.lock.hcl index ef04c701b..d9ea0ef90 100644 --- a/terraform/rds-databases/.terraform.lock.hcl +++ b/terraform/rds-databases/.terraform.lock.hcl @@ -2,79 +2,66 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cyrilgdn/postgresql" { - version = "1.14.0" + version = "1.22.0" constraints = "~> 1.14" hashes = [ - "h1:QyrI7ZVtwZsz39bDCkSfXdoH/VEuQlBQKhEfD1Z7BWo=", - "zh:0752d45a210dc6f12c816ff28cc1e7525c3d645513696928f8338f35809efd23", - "zh:4d09fb054cd115a56a216772e366f66ca2e6a042e282bbbe4797ed27ef6a20e1", - "zh:6775aec3648c1346778a2973c6c315b3bc56cfa0d39e361093c7f605ee45083f", - "zh:69ca89054e769425503dc3bc5dc46e5d9b66423febe569d9dc51073bfcd07533", - "zh:833868737a1b0dda5a1bc751495e81c0c64abf24f14ed46af7bd73797e9b2ddc", - "zh:c8ca05ac00f605f893428577dc65175fe446ab45780b0d1f51eb5a414a4ec924", - "zh:d337c9c3413d29b6c53b9dd41af562b09a21246a185ecd40b97578badbd5c795", - "zh:d387e0f06e7a77e966bea3b76219ccff6eba00ba753eea6655603dd9478059d3", - "zh:e2dee5a0af2b2fd9c6ae66ab70c6fdd4cdf1fb42c52c0e11f5e3a982dad52cd6", - "zh:e9c270d57688ab581fd2aa54895d97f998f9aca5dc7fc21323683c87fb8af140", - "zh:ead7cc067582c674fe49223337be9f15d30381dd9798711df4d66ac55a343f88", - "zh:eede7aefe3374d48b7ce82b34a33d4baf3c598d4b5ecad6d72c72b28ed30aba8", - "zh:ff9cfd21dfcb425f5d27254b3d213f400dd3549c6be751a77836ecade0e47f82", + "h1:8jjuILf07SZmfJjKsjEAlu5125pyRy4sSEJ+y68N7FU=", + "zh:038df91e31bda2a9a1f33adc886bc2084793e151130e29909b92f18b91315724", + "zh:093328afc09cf13a5aed64daf9dc32d764e0a2b3c626c532e211fc22c08088f3", + "zh:108ae8321312085037b987bbe0a4a8e8aa34a763b5b73ad6d9a78d605fa8074d", + "zh:2ef4ae45a8df16ad3e3b2c8082a605354c5ca34015b1709123a911a98f93320d", + "zh:35e13819840c74d8c01fabbe124b44718364acea905066c68fd7ee7d3b4ffc09", + "zh:4eee265e184067d7574787cb682d7f5e339271adc91ec0026de1ab9700f24e39", + "zh:5defd2ac1825d25897125b21c929827dcd471cff7ba8e92c6ae006830bc7bb8c", + "zh:8ef0f114516bd83d87667472f90e609b2c033431d5c9d563db5ca2b87bad9726", + "zh:97ee6cf040e34f649ddc0554dca7db132f6bddae5defe133f21dffa01ece33fe", + "zh:982a831ee1346ae7790ddb6efa8f34297964d68f2910a1ce401505ea96c4bffa", + "zh:a8aefc6c22ff2ffff69d269ba180fdf021ba8510fa3a00683f356f3434657a4a", + "zh:b153499f77d00fae59c6f7d301fd6ffc3595143d540ed475ccf2747bcc1920ac", + "zh:b27e28690c8ca74b861f7ffccd98ada374c8a2cb0e200dbc028c679c009b5779", + "zh:d05579c9998a3efa36b3397a840676edfc8328a6075110d7365ac322f5ce268c", ] } provider "registry.terraform.io/hashicorp/aws" { - version = "3.59.0" + version = "3.76.1" constraints = "~> 3.59" 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/external" { - version = "1.2.0" - constraints = "~> 1.2.0" - 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:z1+WjdwuRX8Aa9a7YKXErhZ5AuvoXiDq7FHts30sZak=", + "zh:1cf933104a641ffdb64d71a76806f4df35d19101b47e0eb02c9c36bd64bfdd2d", + "zh:273afaf908775ade6c9d32462938e7739ee8b00a0de2ef3cdddc5bc115bb1d4f", + "zh:2bc24ae989e38f575de034083082c69b41c54b8df69d35728853257c400ce0f4", + "zh:53ba88dbdaf9f818d35001c3d519a787f457283d9341f562dc3d0af51fd9606e", + "zh:5cdac7afea68bbd89d3bdb345d99470226482eff41f375f220fe338d2e5808da", + "zh:63127808890ac4be6cff6554985510b15ac715df698d550a3e722722dc56523c", + "zh:97a1237791f15373743189b078a0e0f2fa4dd7d7474077423376cd186312dc55", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:a4f625e97e5f25073c08080e4a619f959bc0149fc853a6b1b49ab41d58b59665", + "zh:b56cca54019237941f7614e8d2712586a6ab3092e8e9492c70f06563259171e9", + "zh:d4bc33bfd6ac78fb61e6d48a61c179907dfdbdf149b89fb97272c663989a7fcd", + "zh:e0089d73fa56d128c574601305634a774eebacf4a84babba71da10040cecf99a", + "zh:e957531f1d92a6474c9b02bd9200da91b99ba07a0ab761c8e3176400dd41721c", + "zh:eceb85818d57d8270db4df7564cf4ed51b5c650a361aaa017c42227158e1946b", + "zh:f565e5caa1b349ec404c6d03d01c68b02233f5485ed038d0aab810dd4023a880", ] } provider "registry.terraform.io/hashicorp/random" { - version = "2.3.1" - constraints = "~> 2.3.0" + version = "3.6.1" + constraints = "~> 3.6.1" hashes = [ - "h1:bPBDLMpQzOjKhDlP9uH2UPIz9tSjcbCtLdiJ5ASmCx4=", - "zh:322ec2b56765162c193d0ff0f7634351bf4ca09d719558df82b92d31059995a1", - "zh:34c500857d14148bc6f7f21f9fc0d832ba31d00e1b911b0437d99dda29aeb108", - "zh:a3372514add474fcb07d2026a49b0c0d8a699e365f540e43e5f590eb924b95f7", - "zh:a54acd50f13f38a86454acad16b3487701608188fd2cc454fd48beee00127ae5", - "zh:b1285c47ab01fc11b6086f080da7d17b9155b3fac6a4175948a2abb5d52c60af", - "zh:c7e7bd46218cf504ca31d8a1e4eab5cad625c9951fb89d4f56861d5bddec9afb", - "zh:d9f95764480d7b884db7247a5ee9d1c72aaf1c1cde3d7b5e34bc33c4ef5ccf48", - "zh:ddf11fb807d61ff93c08206733129bf9668fc0c4adedf8a6ac38a7c382a24b35", - "zh:f631a0c1ffa94991d87cd5fe4e08c0dd6d36c780585f35a582c05ee2affb7e86", - "zh:fb5f5fb19e8a9ff73dbdee85a97f548099e480497a7a1f4ca4725c83db300b8d", + "h1:a+Goawwh6Qtg4/bRWzfDtIdrEFfPlnVy0y4LdUQY3nI=", + "zh:2a0ec154e39911f19c8214acd6241e469157489fc56b6c739f45fbed5896a176", + "zh:57f4e553224a5e849c99131f5e5294be3a7adcabe2d867d8a4fef8d0976e0e52", + "zh:58f09948c608e601bd9d0a9e47dcb78e2b2c13b4bda4d8f097d09152ea9e91c5", + "zh:5c2a297146ed6fb3fe934c800e78380f700f49ff24dbb5fb5463134948e3a65f", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:7ce41e26f0603e31cdac849085fc99e5cd5b3b73414c6c6d955c0ceb249b593f", + "zh:8c9e8d30c4ef08ee8bcc4294dbf3c2115cd7d9049c6ba21422bd3471d92faf8a", + "zh:93e91be717a7ffbd6410120eb925ebb8658cc8f563de35a8b53804d33c51c8b0", + "zh:982542e921970d727ce10ed64795bf36c4dec77a5db0741d4665230d12250a0d", + "zh:b9d1873f14d6033e216510ef541c891f44d249464f13cc07d3f782d09c7d18de", + "zh:cfe27faa0bc9556391c8803ade135a5856c34a3fe85b9ae3bdd515013c0c87c1", + "zh:e4aabf3184bbb556b89e4b195eab1514c86a2914dd01c23ad9813ec17e863a8a", ] } diff --git a/terraform/rds-databases/_terraform.tf b/terraform/rds-databases/_terraform.tf index 5c21ffc09..66fef7930 100644 --- a/terraform/rds-databases/_terraform.tf +++ b/terraform/rds-databases/_terraform.tf @@ -14,7 +14,7 @@ terraform { } random = { source = "hashicorp/random" - version = "~> 2.3.0" + version = "~> 3.6.1" } } diff --git a/terraform/rds-databases/instance.tf b/terraform/rds-databases/instance.tf index d44404089..b7a72acbb 100644 --- a/terraform/rds-databases/instance.tf +++ b/terraform/rds-databases/instance.tf @@ -61,7 +61,7 @@ resource "aws_db_instance" "shared" { backup_retention_period = 3 storage_type = "gp2" engine = "postgres" - engine_version = "14.2" + engine_version = "16.1" instance_class = "db.t4g.micro" identifier = "shared" username = "root" @@ -75,10 +75,4 @@ resource "aws_db_instance" "shared" { publicly_accessible = true vpc_security_group_ids = [aws_security_group.rust_prod_db.id] - - lifecycle { - ignore_changes = [ - latest_restorable_time - ] - } } From f49523fb642631cb5d860b54de21fa0f5733640a Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 24 Apr 2024 15:08:39 +0200 Subject: [PATCH 036/217] Deploy log streaming to production --- 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 82aee2dc4..a85f62b8c 100644 --- a/terragrunt/accounts/legacy/crates-io-prod/deployed-ref +++ b/terragrunt/accounts/legacy/crates-io-prod/deployed-ref @@ -1 +1 @@ -e081d07d9a9d2b6ae8db617275d0b626292ce5dc +25aa3d29a8dc1f1369faaff0c627a80ef8a72f24 From 29fd62e281fd3eb35910a3f4fb1b719335131ceb Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sat, 27 Apr 2024 11:56:06 -0400 Subject: [PATCH 037/217] Grant ehuss and spastorino access to triagebot logs This grants scoped-down access to just the triagebot log group in our legacy AWS account. The console appears to still be usable with the access granted here, so it seems good enough. Note that we do grant ability to list all log groups but this is not particularly meaningful. --- .../root/aws-organization/terragrunt.hcl | 14 +++- terragrunt/modules/aws-organization/groups.tf | 66 +++++++++++++++++-- terragrunt/modules/aws-organization/users.tf | 1 + 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/terragrunt/accounts/root/aws-organization/terragrunt.hcl b/terragrunt/accounts/root/aws-organization/terragrunt.hcl index 439185540..2d1ab3bbf 100644 --- a/terragrunt/accounts/root/aws-organization/terragrunt.hcl +++ b/terragrunt/accounts/root/aws-organization/terragrunt.hcl @@ -25,7 +25,7 @@ inputs = { given_name = "Mark", family_name = "Rousskov" email = "mark.simulacrum@gmail.com" - groups = ["infra", "infra-admins"] + groups = ["infra", "infra-admins", "triagebot"] } "rylev" = { given_name = "Ryan", @@ -69,5 +69,17 @@ inputs = { email = "adam@adamharvey.name" groups = ["crates-io"] } + "ehuss" = { + given_name = "Eric" + family_name = "Huss" + email = "eric@huss.org" + groups = ["triagebot"] + } + "spastorino" = { + given_name = "Santiago" + family_name = "Pastorino" + email = "spastorino@gmail.com" + groups = ["triagebot"] + } } } diff --git a/terragrunt/modules/aws-organization/groups.tf b/terragrunt/modules/aws-organization/groups.tf index e8c37997a..ed488d8b7 100644 --- a/terragrunt/modules/aws-organization/groups.tf +++ b/terragrunt/modules/aws-organization/groups.tf @@ -35,6 +35,13 @@ resource "aws_identitystore_group" "crates_io" { description = "The crates.io team" } +resource "aws_identitystore_group" "triagebot" { + identity_store_id = local.identity_store_id + + display_name = "triagebot" + description = "The triagebot maintainers" +} + # The different permission sets a group may have assigned to it resource "aws_ssoadmin_permission_set" "administrator_access" { @@ -85,6 +92,55 @@ resource "aws_ssoadmin_managed_policy_attachment" "read_only_access" { permission_set_arn = aws_ssoadmin_permission_set.read_only_access.arn } +// Triagebot team read-only access into the legacy account. +resource "aws_ssoadmin_permission_set" "triagebot_access" { + instance_arn = local.instance_arn + name = "TriagebotReadOnly" +} + +data "aws_iam_policy_document" "triagebot_access" { + statement { + sid = "ReadLogs" + effect = "Allow" + actions = [ + // Subset of CloudwatchReadOnlyAccess + // See https://docs.aws.amazon.com/aws-managed-policy/latest/reference/CloudWatchReadOnlyAccess.html + "logs:Get*", + "logs:List*", + "logs:StartQuery", + "logs:Describe*", + "logs:FilterLogEvents", + "logs:StartLiveTail", + "logs:StopLiveTail", + ] + resources = [ + "arn:aws:logs:us-west-1:890664054962:log-group:/ecs/triagebot", + "arn:aws:logs:us-west-1:890664054962:log-group:/ecs/triagebot:*", + ] + } + + statement { + sid = "NonResourceStatement" + effect = "Allow" + actions = [ + // Subset of CloudwatchReadOnlyAccess + // See https://docs.aws.amazon.com/aws-managed-policy/latest/reference/CloudWatchReadOnlyAccess.html + "logs:StopQuery", + "logs:DescribeLogGroups", + "logs:DescribeQueries", + "logs:DescribeQueryDefinitions", + "logs:TestMetricFilter", + ] + resources = ["*"] + } +} + +resource "aws_ssoadmin_permission_set_inline_policy" "triagebot_access" { + inline_policy = data.aws_iam_policy_document.triagebot_access.json + instance_arn = local.instance_arn + permission_set_arn = aws_ssoadmin_permission_set.triagebot_access.arn +} + # The assignment of groups to accounts with their respective permission sets locals { @@ -94,7 +150,7 @@ locals { account : aws_organizations_account.admin, groups : [ { group : aws_identitystore_group.infra-admins, - permissions : [aws_ssoadmin_permission_set.view_only_access, aws_ssoadmin_permission_set.administrator_access] }, + permissions : [aws_ssoadmin_permission_set.read_only_access, aws_ssoadmin_permission_set.administrator_access] }, { group : aws_identitystore_group.billing, permissions : [aws_ssoadmin_permission_set.billing_access] }, { group : aws_identitystore_group.infra, @@ -106,11 +162,13 @@ locals { account : aws_organizations_account.legacy, groups : [ { group : aws_identitystore_group.infra-admins, - permissions : [aws_ssoadmin_permission_set.view_only_access, aws_ssoadmin_permission_set.administrator_access] }, + permissions : [aws_ssoadmin_permission_set.read_only_access, aws_ssoadmin_permission_set.administrator_access] }, { group : aws_identitystore_group.billing, permissions : [aws_ssoadmin_permission_set.billing_access] }, { group : aws_identitystore_group.infra, - permissions : [aws_ssoadmin_permission_set.view_only_access] } + permissions : [aws_ssoadmin_permission_set.view_only_access] }, + { group : aws_identitystore_group.triagebot, + permissions : [aws_ssoadmin_permission_set.triagebot_access] }, ] }, # crates-io Staging @@ -119,7 +177,6 @@ locals { groups : [ { group : aws_identitystore_group.infra-admins, permissions : [ - aws_ssoadmin_permission_set.view_only_access, aws_ssoadmin_permission_set.read_only_access, aws_ssoadmin_permission_set.administrator_access ] }, @@ -135,7 +192,6 @@ locals { groups : [ { group : aws_identitystore_group.infra-admins, permissions : [ - aws_ssoadmin_permission_set.view_only_access, aws_ssoadmin_permission_set.read_only_access, aws_ssoadmin_permission_set.administrator_access ] }, diff --git a/terragrunt/modules/aws-organization/users.tf b/terragrunt/modules/aws-organization/users.tf index 18251286e..b6e9b4de5 100644 --- a/terragrunt/modules/aws-organization/users.tf +++ b/terragrunt/modules/aws-organization/users.tf @@ -4,6 +4,7 @@ locals { infra : aws_identitystore_group.infra infra-admins : aws_identitystore_group.infra-admins crates-io : aws_identitystore_group.crates_io + triagebot : aws_identitystore_group.triagebot } # Expand var.users into collection of group memberships associations From b9d73b1f9dbeada098ad446976ba527d3bdda77d Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sat, 27 Apr 2024 12:02:35 -0400 Subject: [PATCH 038/217] Move access to apiraino --- terragrunt/accounts/root/aws-organization/terragrunt.hcl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/terragrunt/accounts/root/aws-organization/terragrunt.hcl b/terragrunt/accounts/root/aws-organization/terragrunt.hcl index 2d1ab3bbf..f55e838ae 100644 --- a/terragrunt/accounts/root/aws-organization/terragrunt.hcl +++ b/terragrunt/accounts/root/aws-organization/terragrunt.hcl @@ -75,10 +75,10 @@ inputs = { email = "eric@huss.org" groups = ["triagebot"] } - "spastorino" = { - given_name = "Santiago" - family_name = "Pastorino" - email = "spastorino@gmail.com" + "apiraino" = { + given_name = "apiraino" + family_name = "n/a" + email = "apiraino@protonmail.com" groups = ["triagebot"] } } From d7674a14be9a92ade9c16c04404101f068a8514c Mon Sep 17 00:00:00 2001 From: Jan David Date: Fri, 3 May 2024 10:04:24 +0200 Subject: [PATCH 039/217] Support multiple AWS regions in Terragrunt Some of our Terraform modules deploy resources to different regions simultaneously. This is done by defining multiple `provider` blocks for AWS with different regions and different aliases, which can then be references in the Terraform resources. With Terragrunt, we are dynamically creating the `provider` block and overwriting any additional providers that are defined in Terraform files. Our script has therefore been extended to accept multiple regions in the `account.json` file and expand them to the same structure that we were using before with Terraform. --- terragrunt/accounts/bors-prod/account.json | 6 ++++- terragrunt/accounts/bors-staging/account.json | 6 ++++- .../accounts/crates-io-prod/account.json | 6 ++++- .../accounts/crates-io-staging/account.json | 10 +++++++- .../accounts/dev-desktops-prod/account.json | 6 ++++- terragrunt/accounts/legacy/account.json | 6 ++++- terragrunt/accounts/root/account.json | 6 ++++- .../accounts/sync-team-prod/account.json | 6 ++++- terragrunt/terragrunt-locals.py | 25 +++++++++++-------- 9 files changed, 59 insertions(+), 18 deletions(-) diff --git a/terragrunt/accounts/bors-prod/account.json b/terragrunt/accounts/bors-prod/account.json index 7ce810d26..a1801707e 100644 --- a/terragrunt/accounts/bors-prod/account.json +++ b/terragrunt/accounts/bors-prod/account.json @@ -1,6 +1,10 @@ { "aws": { "profile": "bors-prod", - "region": "us-east-2" + "regions": [ + { + "region": "us-east-2" + } + ] } } diff --git a/terragrunt/accounts/bors-staging/account.json b/terragrunt/accounts/bors-staging/account.json index 04d49ca70..17406635c 100644 --- a/terragrunt/accounts/bors-staging/account.json +++ b/terragrunt/accounts/bors-staging/account.json @@ -1,6 +1,10 @@ { "aws": { "profile": "bors-staging", - "region": "us-east-2" + "regions": [ + { + "region": "us-east-2" + } + ] } } diff --git a/terragrunt/accounts/crates-io-prod/account.json b/terragrunt/accounts/crates-io-prod/account.json index 3ace57de4..50e359651 100644 --- a/terragrunt/accounts/crates-io-prod/account.json +++ b/terragrunt/accounts/crates-io-prod/account.json @@ -1,6 +1,10 @@ { "aws": { "profile": "crates-io-prod", - "region": "us-west-1" + "regions": [ + { + "region": "us-west-1" + } + ] } } diff --git a/terragrunt/accounts/crates-io-staging/account.json b/terragrunt/accounts/crates-io-staging/account.json index a3300d35a..922a9d76b 100644 --- a/terragrunt/accounts/crates-io-staging/account.json +++ b/terragrunt/accounts/crates-io-staging/account.json @@ -1,6 +1,14 @@ { "aws": { "profile": "crates-io-staging", - "region": "us-west-1" + "regions": [ + { + "region": "us-west-1" + }, + { + "region": "us-east-1", + "alias": "us-east-1" + } + ] } } diff --git a/terragrunt/accounts/dev-desktops-prod/account.json b/terragrunt/accounts/dev-desktops-prod/account.json index 58d11175f..30cbb7cd6 100644 --- a/terragrunt/accounts/dev-desktops-prod/account.json +++ b/terragrunt/accounts/dev-desktops-prod/account.json @@ -1,6 +1,10 @@ { "aws": { "profile": "dev-desktops-prod", - "region": "us-east-1" + "regions": [ + { + "region": "us-east-1" + } + ] } } diff --git a/terragrunt/accounts/legacy/account.json b/terragrunt/accounts/legacy/account.json index be9d5cbab..79e4cd95c 100644 --- a/terragrunt/accounts/legacy/account.json +++ b/terragrunt/accounts/legacy/account.json @@ -1,6 +1,10 @@ { "aws": { "profile": null, - "region": "us-west-1" + "regions": [ + { + "region": "us-west-1" + } + ] } } diff --git a/terragrunt/accounts/root/account.json b/terragrunt/accounts/root/account.json index 5f56e0ae7..971d79e34 100644 --- a/terragrunt/accounts/root/account.json +++ b/terragrunt/accounts/root/account.json @@ -1,6 +1,10 @@ { "aws": { "profile": "rust-root", - "region": "us-east-1" + "regions": [ + { + "region": "us-east-1" + } + ] } } diff --git a/terragrunt/accounts/sync-team-prod/account.json b/terragrunt/accounts/sync-team-prod/account.json index 3d39c0bf1..863d92a08 100644 --- a/terragrunt/accounts/sync-team-prod/account.json +++ b/terragrunt/accounts/sync-team-prod/account.json @@ -1,6 +1,10 @@ { "aws": { "profile": "sync-team-prod", - "region": "us-east-2" + "regions": [ + { + "region": "us-east-2" + } + ] } } diff --git a/terragrunt/terragrunt-locals.py b/terragrunt/terragrunt-locals.py index 02305def6..b416c8b0a 100755 --- a/terragrunt/terragrunt-locals.py +++ b/terragrunt/terragrunt-locals.py @@ -56,20 +56,25 @@ def calculate_remote_state_key(account_json_file, terragrunt_dir): def calculate_providers_content(account_json): - if account_json["aws"]["profile"] is not None: - return f""" -provider "aws" {{ - profile = "{account_json["aws"]["profile"]}" - region = "{account_json["aws"]["region"]}" -}} -""" - else: - return f""" + providers = "" + + for region in account_json["aws"]["regions"]: + body = f' region = "{region["region"]}"' + + if account_json["aws"]["profile"] is not None: + body += f'\n profile = "{account_json["aws"]["profile"]}"' + + if "alias" in region: + body += f'\n alias = "{region["alias"]}"' + + providers += f""" provider "aws" {{ - region = "{account_json["aws"]["region"]}" +{body} }} """ + return providers + def profile_args(account_json): if account_json["aws"]["profile"] is not None: From 555f7ecaaf8662f018b35ec81681cf0260bdb04f Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 2 May 2024 13:17:19 +0200 Subject: [PATCH 040/217] Create bucket to store downloads statistics The crates.io team is considering adding a long-term archive for download statistics so that historic data can be removed from the database. The proposal in rust-lang/crates.io#3479 is to put daily CSV files into an S3 bucket. A new bucket has been created for this purpose. Other than the existing buckets, this one is not publicly accessible. The bucket has been created in the new `crates-io-staging` account so that the team can more easily access it. --- .../.terraform.lock.hcl | 25 ++++++++++++++++++ .../terragrunt.hcl | 12 +++++++++ .../crates-io-downloads-archive/README.md | 12 +++++++++ .../crates-io-downloads-archive/_terraform.tf | 10 +++++++ .../crates-io-downloads-archive/main.tf | 26 +++++++++++++++++++ .../crates-io-downloads-archive/variables.tf | 4 +++ 6 files changed, 89 insertions(+) create mode 100644 terragrunt/accounts/crates-io-staging/crates-io-downloads-archive/.terraform.lock.hcl create mode 100644 terragrunt/accounts/crates-io-staging/crates-io-downloads-archive/terragrunt.hcl create mode 100644 terragrunt/modules/crates-io-downloads-archive/README.md create mode 100644 terragrunt/modules/crates-io-downloads-archive/_terraform.tf create mode 100644 terragrunt/modules/crates-io-downloads-archive/main.tf create mode 100644 terragrunt/modules/crates-io-downloads-archive/variables.tf 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 new file mode 100644 index 000000000..a5470fdfc --- /dev/null +++ b/terragrunt/accounts/crates-io-staging/crates-io-downloads-archive/.terraform.lock.hcl @@ -0,0 +1,25 @@ +# 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 new file mode 100644 index 000000000..e4330cbce --- /dev/null +++ b/terragrunt/accounts/crates-io-staging/crates-io-downloads-archive/terragrunt.hcl @@ -0,0 +1,12 @@ +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/README.md b/terragrunt/modules/crates-io-downloads-archive/README.md new file mode 100644 index 000000000..f8af15a27 --- /dev/null +++ b/terragrunt/modules/crates-io-downloads-archive/README.md @@ -0,0 +1,12 @@ +# Archived Download Statistics for crates.io + +This module creates the infrastructure that is used to archive download +statistics from [crates.io] for longer than 90 days. Currently, that is a single +S3 bucket that stores CSV files with daily download counts. A new bucket has +been created for this purpose, as the existing buckets for [crates.io] are +publicly accessible. + +See [rust-lang/crates.io#3479] for details. + +[crates.io]: https://crates.io +[rust-lang/crates.io#3479]: https://github.com/rust-lang/crates.io/issues/3479 diff --git a/terragrunt/modules/crates-io-downloads-archive/_terraform.tf b/terragrunt/modules/crates-io-downloads-archive/_terraform.tf new file mode 100644 index 000000000..a4f0a52be --- /dev/null +++ b/terragrunt/modules/crates-io-downloads-archive/_terraform.tf @@ -0,0 +1,10 @@ +terraform { + required_version = "~> 1" + + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 4.32" + } + } +} diff --git a/terragrunt/modules/crates-io-downloads-archive/main.tf b/terragrunt/modules/crates-io-downloads-archive/main.tf new file mode 100644 index 000000000..10737afe6 --- /dev/null +++ b/terragrunt/modules/crates-io-downloads-archive/main.tf @@ -0,0 +1,26 @@ +resource "aws_s3_bucket" "downloads_archive" { + bucket = var.downloads_archive_bucket_name +} + +data "aws_iam_user" "heroku_access" { + user_name = "crates-io-heroku-access" +} + +resource "aws_iam_user_policy" "downloads_archive_write" { + name = "downloads-archive-write" + user = data.aws_iam_user.heroku_access.user_name + policy = data.aws_iam_policy_document.downloads_archive_write.json +} + +data "aws_iam_policy_document" "downloads_archive_write" { + statement { + sid = "WriteToDownloadsArchive" + effect = "Allow" + + actions = [ + "s3:PutObject", + ] + + resources = [aws_s3_bucket.downloads_archive.arn] + } +} diff --git a/terragrunt/modules/crates-io-downloads-archive/variables.tf b/terragrunt/modules/crates-io-downloads-archive/variables.tf new file mode 100644 index 000000000..ca2e11544 --- /dev/null +++ b/terragrunt/modules/crates-io-downloads-archive/variables.tf @@ -0,0 +1,4 @@ +variable "downloads_archive_bucket_name" { + description = "The name of the S3 bucket to store the downloads archive" + type = string +} From 4a7ebab47ff158955ffae852aa9f3a2e26fd84e6 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 7 May 2024 13:37:43 +0300 Subject: [PATCH 041/217] Redeploy bucket in us-east-1 --- terragrunt/modules/crates-io-downloads-archive/main.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/terragrunt/modules/crates-io-downloads-archive/main.tf b/terragrunt/modules/crates-io-downloads-archive/main.tf index 10737afe6..803e94f99 100644 --- a/terragrunt/modules/crates-io-downloads-archive/main.tf +++ b/terragrunt/modules/crates-io-downloads-archive/main.tf @@ -1,4 +1,6 @@ resource "aws_s3_bucket" "downloads_archive" { + provider = aws.us-east-1 + bucket = var.downloads_archive_bucket_name } From 96c41965b3606a8571fb9f77471eb8bda835d7cd Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 8 May 2024 10:43:46 +0300 Subject: [PATCH 042/217] Deploy bucket for downloads archive to production --- .../accounts/crates-io-prod/account.json | 4 +++ .../.terraform.lock.hcl | 25 +++++++++++++++++++ .../terragrunt.hcl | 12 +++++++++ .../accounts/crates-io-prod/deployed-ref | 2 +- 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 terragrunt/accounts/crates-io-prod/crates-io-downloads-archive/.terraform.lock.hcl create mode 100644 terragrunt/accounts/crates-io-prod/crates-io-downloads-archive/terragrunt.hcl diff --git a/terragrunt/accounts/crates-io-prod/account.json b/terragrunt/accounts/crates-io-prod/account.json index 50e359651..6979e4e70 100644 --- a/terragrunt/accounts/crates-io-prod/account.json +++ b/terragrunt/accounts/crates-io-prod/account.json @@ -4,6 +4,10 @@ "regions": [ { "region": "us-west-1" + }, + { + "region": "us-east-1", + "alias": "us-east-1" } ] } 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 new file mode 100644 index 000000000..a5470fdfc --- /dev/null +++ b/terragrunt/accounts/crates-io-prod/crates-io-downloads-archive/.terraform.lock.hcl @@ -0,0 +1,25 @@ +# 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 new file mode 100644 index 000000000..561d48b23 --- /dev/null +++ b/terragrunt/accounts/crates-io-prod/crates-io-downloads-archive/terragrunt.hcl @@ -0,0 +1,12 @@ +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-prod/deployed-ref b/terragrunt/accounts/crates-io-prod/deployed-ref index 82aee2dc4..e38c8bfa9 100644 --- a/terragrunt/accounts/crates-io-prod/deployed-ref +++ b/terragrunt/accounts/crates-io-prod/deployed-ref @@ -1 +1 @@ -e081d07d9a9d2b6ae8db617275d0b626292ce5dc +555f7ecaaf8662f018b35ec81681cf0260bdb04f From 384dcc9231d6155c285fb0c2c5c8dea93713023c Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 9 May 2024 18:38:20 +0300 Subject: [PATCH 043/217] 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 74c1826948c5bef2ca889d39c6170b30b3584d95 Mon Sep 17 00:00:00 2001 From: Jan David Date: Mon, 13 May 2024 17:49:01 +0300 Subject: [PATCH 044/217] Increase disk space of dev-desktops on AWS --- terraform/dev-desktops/regions.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/dev-desktops/regions.tf b/terraform/dev-desktops/regions.tf index 344b4f0be..43489aa98 100644 --- a/terraform/dev-desktops/regions.tf +++ b/terraform/dev-desktops/regions.tf @@ -13,7 +13,7 @@ module "aws_eu_central_1" { "dev-desktop-eu-1" = { instance_type = "c6g.8xlarge" instance_arch = "arm64" - storage = 1000 + storage = 2000 } } } @@ -28,7 +28,7 @@ module "aws_us_east_1" { "dev-desktop-us-1" = { instance_type = "c7g.8xlarge" instance_arch = "arm64" - storage = 1000 + storage = 2000 } } } From 338845be5f06cc2f8d21dd1841958435685205a7 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 14 May 2024 14:19:53 +0300 Subject: [PATCH 045/217] Increase disk space of dev-desktops on Azure --- .../resource-group/.terraform.lock.hcl | 22 +++++++++++++++++++ .../westeurope/.terraform.lock.hcl | 22 +++++++++++++++++++ .../westeurope/terragrunt.hcl | 2 +- .../westus2/.terraform.lock.hcl | 22 +++++++++++++++++++ .../dev-desktops-prod/westus2/terragrunt.hcl | 2 +- 5 files changed, 68 insertions(+), 2 deletions(-) diff --git a/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl index 1e88ea022..e822a7f1c 100644 --- a/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl @@ -1,6 +1,28 @@ # This file is maintained automatically by "terraform init". # Manual edits may be lost in future updates. +provider "registry.terraform.io/hashicorp/aws" { + version = "5.49.0" + hashes = [ + "h1:RZtXnBRpO4LNmmz0tXJQLa2heqk9VFGblFZtRCZkm/M=", + "zh:0979b07cdeffb868ea605e4bbc008adc7cccb5f3ba1d3a0b794ea3e8fff20932", + "zh:2121a0a048a1d9419df69f3561e524b7e8a6b74ba0f57bd8948799f12b6ad3a1", + "zh:573362042ba0bd18e98567a4f45d91b09eb0d223513518ba04f16a646a906403", + "zh:57be7a4d6c362be2fa586d270203f4eac1ee239816239a9503b86ebc8fa1fef0", + "zh:5c72ed211d9234edd70eac9d77c3cafc7bbf819d1c28332a6d77acf227c9a23c", + "zh:7786d1a9781f8e8c0079bf58f4ed4aeddec0caf54ad7ddcf43c47936d545a04f", + "zh:82133e7d39787ee91ed41988da71beecc2ecb900b5da94b3f3d77fbc4d4dc722", + "zh:8cdb1c154dead85be8352afd30eaf41c59249de9e7e0a8eb4ab8e625b90a4922", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:ac215fd1c3bd647ae38868940651b97a53197688daefcd70b3595c84560e5267", + "zh:c45db22356d20e431639061a72e07da5201f4937c1df6b9f03f32019facf3905", + "zh:c9ba90e62db9a4708ed1a4e094849f88ce9d44c52b49f613b30bb3f7523b8d97", + "zh:d2be3607be2209995c80dc1d66086d527de5d470f73509e813254067e8287106", + "zh:e3fa20090f3cebf3911fc7ef122bd8c0505e3330ab7d541fa945fea861205007", + "zh:ef1b9d5c0b6279323f2ecfc322db8083e141984cfe1bb2f33c0f4934fccb69e3", + ] +} + provider "registry.terraform.io/hashicorp/azurerm" { version = "3.31.0" constraints = "3.31.0" diff --git a/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl index b72cfc8c4..3fa44ab1a 100644 --- a/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl @@ -1,6 +1,28 @@ # This file is maintained automatically by "terraform init". # Manual edits may be lost in future updates. +provider "registry.terraform.io/hashicorp/aws" { + version = "5.49.0" + hashes = [ + "h1:RZtXnBRpO4LNmmz0tXJQLa2heqk9VFGblFZtRCZkm/M=", + "zh:0979b07cdeffb868ea605e4bbc008adc7cccb5f3ba1d3a0b794ea3e8fff20932", + "zh:2121a0a048a1d9419df69f3561e524b7e8a6b74ba0f57bd8948799f12b6ad3a1", + "zh:573362042ba0bd18e98567a4f45d91b09eb0d223513518ba04f16a646a906403", + "zh:57be7a4d6c362be2fa586d270203f4eac1ee239816239a9503b86ebc8fa1fef0", + "zh:5c72ed211d9234edd70eac9d77c3cafc7bbf819d1c28332a6d77acf227c9a23c", + "zh:7786d1a9781f8e8c0079bf58f4ed4aeddec0caf54ad7ddcf43c47936d545a04f", + "zh:82133e7d39787ee91ed41988da71beecc2ecb900b5da94b3f3d77fbc4d4dc722", + "zh:8cdb1c154dead85be8352afd30eaf41c59249de9e7e0a8eb4ab8e625b90a4922", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:ac215fd1c3bd647ae38868940651b97a53197688daefcd70b3595c84560e5267", + "zh:c45db22356d20e431639061a72e07da5201f4937c1df6b9f03f32019facf3905", + "zh:c9ba90e62db9a4708ed1a4e094849f88ce9d44c52b49f613b30bb3f7523b8d97", + "zh:d2be3607be2209995c80dc1d66086d527de5d470f73509e813254067e8287106", + "zh:e3fa20090f3cebf3911fc7ef122bd8c0505e3330ab7d541fa945fea861205007", + "zh:ef1b9d5c0b6279323f2ecfc322db8083e141984cfe1bb2f33c0f4934fccb69e3", + ] +} + provider "registry.terraform.io/hashicorp/azurerm" { version = "3.31.0" constraints = "3.31.0" diff --git a/terragrunt/accounts/dev-desktops-prod/westeurope/terragrunt.hcl b/terragrunt/accounts/dev-desktops-prod/westeurope/terragrunt.hcl index 839b1287d..28a315b87 100644 --- a/terragrunt/accounts/dev-desktops-prod/westeurope/terragrunt.hcl +++ b/terragrunt/accounts/dev-desktops-prod/westeurope/terragrunt.hcl @@ -22,7 +22,7 @@ inputs = { instances = { "dev-desktop-eu-2" = { instance_type = "Standard_F32s_v2" - storage = 1000 + storage = 2048 } } } diff --git a/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl index b72cfc8c4..3fa44ab1a 100644 --- a/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl @@ -1,6 +1,28 @@ # This file is maintained automatically by "terraform init". # Manual edits may be lost in future updates. +provider "registry.terraform.io/hashicorp/aws" { + version = "5.49.0" + hashes = [ + "h1:RZtXnBRpO4LNmmz0tXJQLa2heqk9VFGblFZtRCZkm/M=", + "zh:0979b07cdeffb868ea605e4bbc008adc7cccb5f3ba1d3a0b794ea3e8fff20932", + "zh:2121a0a048a1d9419df69f3561e524b7e8a6b74ba0f57bd8948799f12b6ad3a1", + "zh:573362042ba0bd18e98567a4f45d91b09eb0d223513518ba04f16a646a906403", + "zh:57be7a4d6c362be2fa586d270203f4eac1ee239816239a9503b86ebc8fa1fef0", + "zh:5c72ed211d9234edd70eac9d77c3cafc7bbf819d1c28332a6d77acf227c9a23c", + "zh:7786d1a9781f8e8c0079bf58f4ed4aeddec0caf54ad7ddcf43c47936d545a04f", + "zh:82133e7d39787ee91ed41988da71beecc2ecb900b5da94b3f3d77fbc4d4dc722", + "zh:8cdb1c154dead85be8352afd30eaf41c59249de9e7e0a8eb4ab8e625b90a4922", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:ac215fd1c3bd647ae38868940651b97a53197688daefcd70b3595c84560e5267", + "zh:c45db22356d20e431639061a72e07da5201f4937c1df6b9f03f32019facf3905", + "zh:c9ba90e62db9a4708ed1a4e094849f88ce9d44c52b49f613b30bb3f7523b8d97", + "zh:d2be3607be2209995c80dc1d66086d527de5d470f73509e813254067e8287106", + "zh:e3fa20090f3cebf3911fc7ef122bd8c0505e3330ab7d541fa945fea861205007", + "zh:ef1b9d5c0b6279323f2ecfc322db8083e141984cfe1bb2f33c0f4934fccb69e3", + ] +} + provider "registry.terraform.io/hashicorp/azurerm" { version = "3.31.0" constraints = "3.31.0" diff --git a/terragrunt/accounts/dev-desktops-prod/westus2/terragrunt.hcl b/terragrunt/accounts/dev-desktops-prod/westus2/terragrunt.hcl index ca31a2934..899693307 100644 --- a/terragrunt/accounts/dev-desktops-prod/westus2/terragrunt.hcl +++ b/terragrunt/accounts/dev-desktops-prod/westus2/terragrunt.hcl @@ -22,7 +22,7 @@ inputs = { instances = { "dev-desktop-us-2" = { instance_type = "Standard_F32s_v2" - storage = 1000 + storage = 2048 } } } From cbc9bfcb9eb8f81b3af6d00a8ba9f2da8431fcb4 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 14 May 2024 17:16:47 +0300 Subject: [PATCH 046/217] Fix permissions to upload files to S3 --- terragrunt/modules/crates-io-downloads-archive/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/modules/crates-io-downloads-archive/main.tf b/terragrunt/modules/crates-io-downloads-archive/main.tf index 803e94f99..43673f72c 100644 --- a/terragrunt/modules/crates-io-downloads-archive/main.tf +++ b/terragrunt/modules/crates-io-downloads-archive/main.tf @@ -23,6 +23,6 @@ data "aws_iam_policy_document" "downloads_archive_write" { "s3:PutObject", ] - resources = [aws_s3_bucket.downloads_archive.arn] + resources = ["${aws_s3_bucket.downloads_archive.arn}/*"] } } From 6607a57de8e4a33358425bb159beb10be83ad829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Thu, 23 May 2024 18:31:24 +0200 Subject: [PATCH 047/217] Bors2 will be deployed from the main branch to a staging environment --- terragrunt/modules/bors/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/modules/bors/main.tf b/terragrunt/modules/bors/main.tf index f2caade08..61dcb9eaa 100644 --- a/terragrunt/modules/bors/main.tf +++ b/terragrunt/modules/bors/main.tf @@ -70,7 +70,7 @@ resource "aws_iam_role" "gha" { } Condition = { StringLike = { - "token.actions.githubusercontent.com:sub" : "repo:rust-lang/bors:ref:refs/heads/staging" + "token.actions.githubusercontent.com:sub" : "repo:rust-lang/bors:ref:refs/heads/main" } StringEquals = { "token.actions.githubusercontent.com:aud" : "sts.amazonaws.com" From cb9292fb0ea42718d4d8b4ba43258d1b2baac0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Thu, 23 May 2024 18:34:33 +0200 Subject: [PATCH 048/217] Give infra team access to staging bors environment --- terragrunt/modules/aws-organization/groups.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/modules/aws-organization/groups.tf b/terragrunt/modules/aws-organization/groups.tf index ed488d8b7..9770cd33c 100644 --- a/terragrunt/modules/aws-organization/groups.tf +++ b/terragrunt/modules/aws-organization/groups.tf @@ -234,7 +234,7 @@ locals { account : aws_organizations_account.bors_staging, groups : [ { group : aws_identitystore_group.infra, - permissions : [aws_ssoadmin_permission_set.read_only_access] }, + permissions : [aws_ssoadmin_permission_set.read_only_access, aws_ssoadmin_permission_set.administrator_access] }, { group : aws_identitystore_group.infra-admins, permissions : [aws_ssoadmin_permission_set.read_only_access, aws_ssoadmin_permission_set.administrator_access] }, ] From 71c5740d1ec9c108de2be4b6290bf9e6cb00063a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Mon, 27 May 2024 21:33:10 +0200 Subject: [PATCH 049/217] Change bors environment variable --- terragrunt/modules/bors/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/modules/bors/main.tf b/terragrunt/modules/bors/main.tf index 61dcb9eaa..3c7795fcf 100644 --- a/terragrunt/modules/bors/main.tf +++ b/terragrunt/modules/bors/main.tf @@ -294,7 +294,7 @@ resource "aws_ecs_task_definition" "bors" { valueFrom = data.aws_ssm_parameter.app_key.arn }, { - name = "DATABASE" + name = "DATABASE_URL" valueFrom = aws_ssm_parameter.db_endpoint.arn } ] From 854028f3153080cdba3ad66a060866a4e3ba95f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Wed, 29 May 2024 11:04:41 +0200 Subject: [PATCH 050/217] Update DB to 15.5 To match what is currently deployed to production --- terragrunt/modules/bors/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/modules/bors/main.tf b/terragrunt/modules/bors/main.tf index 3c7795fcf..2befa5735 100644 --- a/terragrunt/modules/bors/main.tf +++ b/terragrunt/modules/bors/main.tf @@ -440,7 +440,7 @@ data "aws_vpc" "default" { resource "aws_db_instance" "primary" { db_name = "bors" engine = "postgres" - engine_version = "15.3" + engine_version = "15.5" instance_class = "db.t4g.micro" backup_retention_period = 7 From 4a615fa595a1426aec42ba19efe59b3cf425028e Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 30 May 2024 13:27:19 +0200 Subject: [PATCH 051/217] Grant infra team permissions to manage API keys --- terraform/team-members-datadog/infra.tf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/terraform/team-members-datadog/infra.tf b/terraform/team-members-datadog/infra.tf index a0b96e35d..9464658a9 100644 --- a/terraform/team-members-datadog/infra.tf +++ b/terraform/team-members-datadog/infra.tf @@ -18,6 +18,9 @@ resource "datadog_role" "infra" { data.datadog_permissions.all.permissions.logs_live_tail, data.datadog_permissions.all.permissions.logs_read_archives, data.datadog_permissions.all.permissions.dashboards_write, + data.datadog_permissions.all.permissions.api_keys_read, + data.datadog_permissions.all.permissions.api_keys_write, + data.datadog_permissions.all.permissions.user_app_keys, ]) content { From c1717405904f5793c32a49711057caec583a238b Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 30 May 2024 13:27:53 +0200 Subject: [PATCH 052/217] Create Datadog account for Walter --- terraform/team-members-datadog/foundation.tf | 1 + terraform/team-members-datadog/users.tf | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/terraform/team-members-datadog/foundation.tf b/terraform/team-members-datadog/foundation.tf index 3af19223c..966b040e8 100644 --- a/terraform/team-members-datadog/foundation.tf +++ b/terraform/team-members-datadog/foundation.tf @@ -6,6 +6,7 @@ locals { "paullenz" = local.users.paullenz "rustfoundation" = local.users.rustfoundation "tobias" = local.users.tobias + "walter" = local.users.walter } } diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index 296223140..f16bb71cb 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -52,6 +52,10 @@ locals { login = "tobiasbieniek@rustfoundation.org" name = "Tobias Bieniek" } + "walter" = { + login = "walterpearce@rustfoundation.org" + name = "Walter Pearce" + } } # This is a list of all users from all teams. When a user is part of multiple teams, this list will contain multiple From 5acc6dd9ca14d75cd4501bc03d508ff4b0fe521f Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 30 May 2024 14:07:07 +0200 Subject: [PATCH 053/217] Create team for crater --- terraform/team-members-datadog/crater.tf | 34 ++++++++++++++++++++++++ terraform/team-members-datadog/users.tf | 1 + 2 files changed, 35 insertions(+) create mode 100644 terraform/team-members-datadog/crater.tf diff --git a/terraform/team-members-datadog/crater.tf b/terraform/team-members-datadog/crater.tf new file mode 100644 index 000000000..89829f64f --- /dev/null +++ b/terraform/team-members-datadog/crater.tf @@ -0,0 +1,34 @@ +locals { + crater = { + "walter" = local.users.walter + } +} + +resource "datadog_role" "crater" { + name = "crater" + + dynamic "permission" { + for_each = toset([ + data.datadog_permissions.all.permissions.dashboards_write, + data.datadog_permissions.all.permissions.api_keys_read, + data.datadog_permissions.all.permissions.user_app_keys, + ]) + + content { + id = permission.value + } + } +} + +resource "datadog_team" "crater" { + name = "crater" + description = "The team maintaining crater" + handle = "crater" +} + +resource "datadog_team_membership" "crater" { + for_each = local.crater + + team_id = datadog_team.crater.id + user_id = datadog_user.users[each.key].id +} diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index f16bb71cb..e59da0c3a 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -69,6 +69,7 @@ locals { # { "alice" = { login = "Alice", email = "alice@example.com", roles = ["Foundation Staff"] } }, # ] _do_not_use_all_teams = [ + { for name, user in local.crater : name => merge(user, { roles = [datadog_role.crater.name] }) }, { for name, user in local.crates_io : name => merge(user, { roles = [datadog_role.crates_io.name] }) }, { for name, user in local.foundation : name => merge(user, { roles = [datadog_role.foundation.name] }) }, { for name, user in local.foundation_board : name => merge(user, { roles = [datadog_role.board_member.name] }) }, From 433efb52073f7583796e8957a2a8f688ff739312 Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 30 May 2024 15:44:02 +0200 Subject: [PATCH 054/217] Grant the infra-team permissions to create saved views Saved views on Datadog are globally shared across an organization, so we want to limit who can create them to ensure a high signal-to-noise ratio. We can consider loosening this restriction as we gain more experience with the platform. --- terraform/team-members-datadog/infra.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/team-members-datadog/infra.tf b/terraform/team-members-datadog/infra.tf index 9464658a9..aa4d668dd 100644 --- a/terraform/team-members-datadog/infra.tf +++ b/terraform/team-members-datadog/infra.tf @@ -18,6 +18,7 @@ resource "datadog_role" "infra" { data.datadog_permissions.all.permissions.logs_live_tail, data.datadog_permissions.all.permissions.logs_read_archives, data.datadog_permissions.all.permissions.dashboards_write, + data.datadog_permissions.all.permissions.saved_views_write, data.datadog_permissions.all.permissions.api_keys_read, data.datadog_permissions.all.permissions.api_keys_write, data.datadog_permissions.all.permissions.user_app_keys, From 688a7d98baacd45aed3cdf3ed5c489e2a0899250 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sat, 1 Jun 2024 14:38:47 +0200 Subject: [PATCH 055/217] crates-io: Add `path` argument to `redirect_to_cloudfront()` fn --- terragrunt/modules/crates-io/compute-static/src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs index 3d7060502..e893e8eb5 100644 --- a/terragrunt/modules/crates-io/compute-static/src/main.rs +++ b/terragrunt/modules/crates-io/compute-static/src/main.rs @@ -116,7 +116,7 @@ fn handle_request(config: &Config, mut request: Request) -> Result Result { - let url = format!("https://{}/db-dump.tar.gz", config.cloudfront_url); +fn redirect_to_cloudfront(config: &Config, path: &str) -> Result { + let url = format!("https://{}/{path}", config.cloudfront_url); Ok(Response::temporary_redirect(url)) } From 8ae0c4406714cb86e9317049d2a662585c9fb8b1 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sat, 1 Jun 2024 14:39:19 +0200 Subject: [PATCH 056/217] crates-io: Add support for `db-dump.zip` files --- .../modules/crates-io/compute-static/src/main.rs | 2 ++ terragrunt/modules/crates-io/s3-static.tf | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs index e893e8eb5..3753f7e17 100644 --- a/terragrunt/modules/crates-io/compute-static/src/main.rs +++ b/terragrunt/modules/crates-io/compute-static/src/main.rs @@ -117,6 +117,8 @@ fn handle_request(config: &Config, mut request: Request) -> Result Date: Tue, 4 Jun 2024 13:51:45 +0200 Subject: [PATCH 057/217] Create Terragrunt module for win.rustup.rs `win.rustup.rs` is an old CloudFront distribution that is not yet managed in Terraform or Terragrunt. A new Terragrunt module has been created so that we can easily create a new staging environment. The module copies the existing functionality, but uses a response header policy instead of a Lambda function to set the `Content-Disposition` header. --- terragrunt/modules/win-rustup-rs/README.md | 6 ++ .../modules/win-rustup-rs/_terraform.tf | 11 +++ .../modules/win-rustup-rs/certificate.tf | 13 ++++ terragrunt/modules/win-rustup-rs/data.tf | 7 ++ terragrunt/modules/win-rustup-rs/lambda.tf | 13 ++++ .../lambdas/origin-request/index.js | 15 ++++ terragrunt/modules/win-rustup-rs/main.tf | 71 +++++++++++++++++++ terragrunt/modules/win-rustup-rs/variables.tf | 9 +++ 8 files changed, 145 insertions(+) create mode 100644 terragrunt/modules/win-rustup-rs/README.md create mode 100644 terragrunt/modules/win-rustup-rs/_terraform.tf create mode 100644 terragrunt/modules/win-rustup-rs/certificate.tf create mode 100644 terragrunt/modules/win-rustup-rs/data.tf create mode 100644 terragrunt/modules/win-rustup-rs/lambda.tf create mode 100644 terragrunt/modules/win-rustup-rs/lambdas/origin-request/index.js create mode 100644 terragrunt/modules/win-rustup-rs/main.tf create mode 100644 terragrunt/modules/win-rustup-rs/variables.tf diff --git a/terragrunt/modules/win-rustup-rs/README.md b/terragrunt/modules/win-rustup-rs/README.md new file mode 100644 index 000000000..b66cdf9f0 --- /dev/null +++ b/terragrunt/modules/win-rustup-rs/README.md @@ -0,0 +1,6 @@ +# win.rustup.rs + +`win.rustup.rs` is a CloudFront distribution that provides convenient, short +URLs for downloading the Rustup installer on Windows. It features a path for +each supported architecture, which serves the latest version of the respective +installer. diff --git a/terragrunt/modules/win-rustup-rs/_terraform.tf b/terragrunt/modules/win-rustup-rs/_terraform.tf new file mode 100644 index 000000000..6e71aed42 --- /dev/null +++ b/terragrunt/modules/win-rustup-rs/_terraform.tf @@ -0,0 +1,11 @@ +terraform { + required_version = "~> 1.0" + + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 4.20" + } + } +} + diff --git a/terragrunt/modules/win-rustup-rs/certificate.tf b/terragrunt/modules/win-rustup-rs/certificate.tf new file mode 100644 index 000000000..d5eca7bef --- /dev/null +++ b/terragrunt/modules/win-rustup-rs/certificate.tf @@ -0,0 +1,13 @@ +module "certificate" { + source = "../acm-certificate" + + providers = { + aws = aws.us-east-1 + } + + domains = [ + var.domain_name, + ] + + legacy = true +} diff --git a/terragrunt/modules/win-rustup-rs/data.tf b/terragrunt/modules/win-rustup-rs/data.tf new file mode 100644 index 000000000..badb58c38 --- /dev/null +++ b/terragrunt/modules/win-rustup-rs/data.tf @@ -0,0 +1,7 @@ +data "aws_iam_role" "cloudfront_lambda" { + name = "cloudfront-lambda" +} + +data "aws_s3_bucket" "static" { + bucket = var.static_bucket +} diff --git a/terragrunt/modules/win-rustup-rs/lambda.tf b/terragrunt/modules/win-rustup-rs/lambda.tf new file mode 100644 index 000000000..b19855306 --- /dev/null +++ b/terragrunt/modules/win-rustup-rs/lambda.tf @@ -0,0 +1,13 @@ +module "origin_request" { + source = "../aws-lambda" + + providers = { + aws = aws.us-east-1 + } + + name = "${local.human_readable_name}--origin-request" + source_dir = "lambdas/origin-request" + handler = "index.handler" + runtime = "nodejs16.x" + role_arn = data.aws_iam_role.cloudfront_lambda.arn +} diff --git a/terragrunt/modules/win-rustup-rs/lambdas/origin-request/index.js b/terragrunt/modules/win-rustup-rs/lambdas/origin-request/index.js new file mode 100644 index 000000000..ee16695f6 --- /dev/null +++ b/terragrunt/modules/win-rustup-rs/lambdas/origin-request/index.js @@ -0,0 +1,15 @@ +'use strict'; + +exports.handler = (event, context, callback) => { + const request = event.Records[0].cf.request; + const headers = request.headers; + + if (request.uri === '/') { + request.uri = '/i686-pc-windows-msvc/rustup-init.exe'; + } else if (request.uri === '/i686') { + request.uri = '/i686-pc-windows-msvc/rustup-init.exe'; + } else if (request.uri === '/x86_64') { + request.uri = '/x86_64-pc-windows-msvc/rustup-init.exe'; + } + callback(null, request); +}; diff --git a/terragrunt/modules/win-rustup-rs/main.tf b/terragrunt/modules/win-rustup-rs/main.tf new file mode 100644 index 000000000..06439976e --- /dev/null +++ b/terragrunt/modules/win-rustup-rs/main.tf @@ -0,0 +1,71 @@ +locals { + human_readable_name = replace(var.domain_name, ".", "-") +} + +resource "aws_cloudfront_response_headers_policy" "content_disposition" { + name = local.human_readable_name + comment = "Set the Content-Disposition header for ${var.domain_name}" + + custom_headers_config { + items { + header = "Content-Disposition" + value = "attachment; filename=\"rustup-init.exe\"" + override = true + } + } +} + +resource "aws_cloudfront_distribution" "distribution" { + comment = var.domain_name + + enabled = true + wait_for_deployment = false + is_ipv6_enabled = true + price_class = "PriceClass_All" + + aliases = [ + var.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 = "main" + allowed_methods = ["GET", "HEAD"] + cached_methods = ["GET", "HEAD"] + compress = true + viewer_protocol_policy = "redirect-to-https" + + response_headers_policy_id = aws_cloudfront_response_headers_policy.content_disposition.id + + forwarded_values { + query_string = false + + cookies { + forward = "none" + } + } + + lambda_function_association { + event_type = "origin-request" + lambda_arn = module.origin_request.version_arn + include_body = false + } + } + + origin { + origin_id = "main" + domain_name = data.aws_s3_bucket.static.bucket_regional_domain_name + origin_path = "/rustup/dist" + } + + restrictions { + geo_restriction { + restriction_type = "none" + } + } +} diff --git a/terragrunt/modules/win-rustup-rs/variables.tf b/terragrunt/modules/win-rustup-rs/variables.tf new file mode 100644 index 000000000..5d8edfdef --- /dev/null +++ b/terragrunt/modules/win-rustup-rs/variables.tf @@ -0,0 +1,9 @@ +variable "domain_name" { + description = "The domain name for the CloudFront distribution" + type = string +} + +variable "static_bucket" { + description = "Name of the bucket that stores the Rustup releases" + type = string +} From 4a421179e5b1438818e899b42177aa7ae21e8770 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 4 Jun 2024 13:53:49 +0200 Subject: [PATCH 058/217] Create staging environment for win.rustup.rs The `win.rustup.rs` distribution does not have a staging environment right now. A new state has been created in Terragrunt to create a new environment to test the distribution. --- terragrunt/accounts/legacy/account.json | 4 ++ .../win-rustup-rs/.terraform.lock.hcl | 44 +++++++++++++++++++ .../rustup-dev/win-rustup-rs/terragrunt.hcl | 13 ++++++ 3 files changed, 61 insertions(+) create mode 100644 terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/.terraform.lock.hcl create mode 100644 terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/terragrunt.hcl diff --git a/terragrunt/accounts/legacy/account.json b/terragrunt/accounts/legacy/account.json index 79e4cd95c..3bc0057ef 100644 --- a/terragrunt/accounts/legacy/account.json +++ b/terragrunt/accounts/legacy/account.json @@ -4,6 +4,10 @@ "regions": [ { "region": "us-west-1" + }, + { + "region": "us-east-1", + "alias": "us-east-1" } ] } diff --git a/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/.terraform.lock.hcl b/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/.terraform.lock.hcl new file mode 100644 index 000000000..eb264ac4e --- /dev/null +++ b/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/.terraform.lock.hcl @@ -0,0 +1,44 @@ +# 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.20" + 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", + ] +} + +provider "registry.terraform.io/hashicorp/external" { + version = "2.3.3" + hashes = [ + "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", + ] +} diff --git a/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/terragrunt.hcl b/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/terragrunt.hcl new file mode 100644 index 000000000..e910aebe6 --- /dev/null +++ b/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/terragrunt.hcl @@ -0,0 +1,13 @@ +terraform { + source = "../../../../..//terragrunt/modules/win-rustup-rs" +} + +include { + path = find_in_parent_folders() + merge_strategy = "deep" +} + +inputs = { + domain_name = "dev-win.rustup.rs" + static_bucket = "dev-static-rust-lang-org" +} From ac54e617aa43f157da858d5ef08d456ca62efdf3 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 4 Jun 2024 14:34:32 +0200 Subject: [PATCH 059/217] Create DNS record for distribution --- terragrunt/modules/win-rustup-rs/data.tf | 5 +++++ terragrunt/modules/win-rustup-rs/dns.tf | 7 +++++++ 2 files changed, 12 insertions(+) create mode 100644 terragrunt/modules/win-rustup-rs/dns.tf diff --git a/terragrunt/modules/win-rustup-rs/data.tf b/terragrunt/modules/win-rustup-rs/data.tf index badb58c38..2fff95818 100644 --- a/terragrunt/modules/win-rustup-rs/data.tf +++ b/terragrunt/modules/win-rustup-rs/data.tf @@ -2,6 +2,11 @@ data "aws_iam_role" "cloudfront_lambda" { name = "cloudfront-lambda" } +data "aws_route53_zone" "rustup" { + // Convert {dev-win,win}.rustup.rs into rustup.rs + name = join(".", reverse(slice(reverse(split(".", var.domain_name)), 0, 2))) +} + data "aws_s3_bucket" "static" { bucket = var.static_bucket } diff --git a/terragrunt/modules/win-rustup-rs/dns.tf b/terragrunt/modules/win-rustup-rs/dns.tf new file mode 100644 index 000000000..4bded9f7e --- /dev/null +++ b/terragrunt/modules/win-rustup-rs/dns.tf @@ -0,0 +1,7 @@ +resource "aws_route53_record" "record" { + zone_id = data.aws_route53_zone.rustup.id + name = var.domain_name + type = "CNAME" + ttl = 300 + records = [aws_cloudfront_distribution.distribution.domain_name] +} From f3cb562b77674d7646c6eb450ba691f30d75cd8b Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 5 Jun 2024 11:02:19 +0200 Subject: [PATCH 060/217] Import production environment The existing CloudFront distribution has been imported into Terragrunt and then updated to use the new response header policy and new Lambda function. --- .../accounts/legacy/rustup-prod/deployed-ref | 1 + .../win-rustup-rs/.terraform.lock.hcl | 44 +++++++++++++++++++ .../rustup-prod/win-rustup-rs/terragrunt.hcl | 13 ++++++ 3 files changed, 58 insertions(+) create mode 100644 terragrunt/accounts/legacy/rustup-prod/deployed-ref create mode 100644 terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/.terraform.lock.hcl create mode 100644 terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/terragrunt.hcl diff --git a/terragrunt/accounts/legacy/rustup-prod/deployed-ref b/terragrunt/accounts/legacy/rustup-prod/deployed-ref new file mode 100644 index 000000000..8d32345eb --- /dev/null +++ b/terragrunt/accounts/legacy/rustup-prod/deployed-ref @@ -0,0 +1 @@ +ac54e617aa43f157da858d5ef08d456ca62efdf3 diff --git a/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/.terraform.lock.hcl b/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/.terraform.lock.hcl new file mode 100644 index 000000000..eb264ac4e --- /dev/null +++ b/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/.terraform.lock.hcl @@ -0,0 +1,44 @@ +# 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.20" + 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", + ] +} + +provider "registry.terraform.io/hashicorp/external" { + version = "2.3.3" + hashes = [ + "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", + ] +} diff --git a/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/terragrunt.hcl b/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/terragrunt.hcl new file mode 100644 index 000000000..37136c672 --- /dev/null +++ b/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/terragrunt.hcl @@ -0,0 +1,13 @@ +terraform { + source = "git::../../../../..//terragrunt/modules/win-rustup-rs?ref=${trimspace(file("../deployed-ref"))}" +} + +include { + path = find_in_parent_folders() + merge_strategy = "deep" +} + +inputs = { + domain_name = "win.rustup.rs" + static_bucket = "static-rust-lang-org" +} From 9fd79c3ea80c41cafe3c1bc0f0686748af8cc6e0 Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 5 Jun 2024 11:31:52 +0200 Subject: [PATCH 061/217] Support new architecture on win.rustup.rs --- .../modules/win-rustup-rs/lambdas/origin-request/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/terragrunt/modules/win-rustup-rs/lambdas/origin-request/index.js b/terragrunt/modules/win-rustup-rs/lambdas/origin-request/index.js index ee16695f6..a4aaa01db 100644 --- a/terragrunt/modules/win-rustup-rs/lambdas/origin-request/index.js +++ b/terragrunt/modules/win-rustup-rs/lambdas/origin-request/index.js @@ -10,6 +10,8 @@ exports.handler = (event, context, callback) => { request.uri = '/i686-pc-windows-msvc/rustup-init.exe'; } else if (request.uri === '/x86_64') { request.uri = '/x86_64-pc-windows-msvc/rustup-init.exe'; + } else if (request.uri === '/aarch64') { + request.uri = '/aarch64-pc-windows-msvc/rustup-init.exe'; } callback(null, request); }; From bab1bdb67e482e467864be5fcf3d080456fbd180 Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 5 Jun 2024 11:37:18 +0200 Subject: [PATCH 062/217] Deploy new architecture to production --- terragrunt/accounts/legacy/rustup-prod/deployed-ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/accounts/legacy/rustup-prod/deployed-ref b/terragrunt/accounts/legacy/rustup-prod/deployed-ref index 8d32345eb..47f4a9edc 100644 --- a/terragrunt/accounts/legacy/rustup-prod/deployed-ref +++ b/terragrunt/accounts/legacy/rustup-prod/deployed-ref @@ -1 +1 @@ -ac54e617aa43f157da858d5ef08d456ca62efdf3 +9fd79c3ea80c41cafe3c1bc0f0686748af8cc6e0 From a0e6a0452939561aa56dd76d2f46bf08b206cbbf Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 5 Jun 2024 15:34:32 +0200 Subject: [PATCH 063/217] crates-io: Use `dynamic` block to reduce duplication --- terragrunt/modules/crates-io/s3-static.tf | 27 +++++++++-------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/terragrunt/modules/crates-io/s3-static.tf b/terragrunt/modules/crates-io/s3-static.tf index f19fa8374..8f10a0f6c 100644 --- a/terragrunt/modules/crates-io/s3-static.tf +++ b/terragrunt/modules/crates-io/s3-static.tf @@ -16,25 +16,18 @@ resource "aws_s3_bucket" "static" { // Keep only the live db-dumps and the previous day's versions, removing // all the other ones. This is needed because we don't want this file to be // versioned, while all the other ones in the bucket should be versioned. - lifecycle_rule { - id = "purge-db-dump" - enabled = true - prefix = "db-dump.tar.gz" - - abort_incomplete_multipart_upload_days = 1 - noncurrent_version_expiration { - days = 1 - } - } + dynamic "lifecycle_rule" { + for_each = toset(["db-dump.tar.gz", "db-dump.zip"]) - lifecycle_rule { - id = "purge-db-dump-zip" - enabled = true - prefix = "db-dump.zip" + content { + id = "purge-${replace(lifecycle_rule.key, ".", "-")}" + enabled = true + prefix = lifecycle_rule.key - abort_incomplete_multipart_upload_days = 1 - noncurrent_version_expiration { - days = 1 + abort_incomplete_multipart_upload_days = 1 + noncurrent_version_expiration { + days = 1 + } } } From 72f17a0c5537a8aa23271c5836fe50673e95018c Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 5 Jun 2024 15:37:38 +0200 Subject: [PATCH 064/217] Switch to CloudFront function --- terragrunt/modules/win-rustup-rs/lambda.tf | 13 ------------- .../{origin-request => viewer-request}/index.js | 12 +++++------- terragrunt/modules/win-rustup-rs/main.tf | 13 +++++++++---- 3 files changed, 14 insertions(+), 24 deletions(-) delete mode 100644 terragrunt/modules/win-rustup-rs/lambda.tf rename terragrunt/modules/win-rustup-rs/lambdas/{origin-request => viewer-request}/index.js (70%) diff --git a/terragrunt/modules/win-rustup-rs/lambda.tf b/terragrunt/modules/win-rustup-rs/lambda.tf deleted file mode 100644 index b19855306..000000000 --- a/terragrunt/modules/win-rustup-rs/lambda.tf +++ /dev/null @@ -1,13 +0,0 @@ -module "origin_request" { - source = "../aws-lambda" - - providers = { - aws = aws.us-east-1 - } - - name = "${local.human_readable_name}--origin-request" - source_dir = "lambdas/origin-request" - handler = "index.handler" - runtime = "nodejs16.x" - role_arn = data.aws_iam_role.cloudfront_lambda.arn -} diff --git a/terragrunt/modules/win-rustup-rs/lambdas/origin-request/index.js b/terragrunt/modules/win-rustup-rs/lambdas/viewer-request/index.js similarity index 70% rename from terragrunt/modules/win-rustup-rs/lambdas/origin-request/index.js rename to terragrunt/modules/win-rustup-rs/lambdas/viewer-request/index.js index a4aaa01db..496284a8a 100644 --- a/terragrunt/modules/win-rustup-rs/lambdas/origin-request/index.js +++ b/terragrunt/modules/win-rustup-rs/lambdas/viewer-request/index.js @@ -1,8 +1,5 @@ -'use strict'; - -exports.handler = (event, context, callback) => { - const request = event.Records[0].cf.request; - const headers = request.headers; +function handler(event) { + var request = event.request; if (request.uri === '/') { request.uri = '/i686-pc-windows-msvc/rustup-init.exe'; @@ -13,5 +10,6 @@ exports.handler = (event, context, callback) => { } else if (request.uri === '/aarch64') { request.uri = '/aarch64-pc-windows-msvc/rustup-init.exe'; } - callback(null, request); -}; + + return request; +} diff --git a/terragrunt/modules/win-rustup-rs/main.tf b/terragrunt/modules/win-rustup-rs/main.tf index 06439976e..4282f8069 100644 --- a/terragrunt/modules/win-rustup-rs/main.tf +++ b/terragrunt/modules/win-rustup-rs/main.tf @@ -2,6 +2,12 @@ locals { human_readable_name = replace(var.domain_name, ".", "-") } +resource "aws_cloudfront_function" "viewer_request" { + name = "${local.human_readable_name}--viewer-request" + runtime = "cloudfront-js-1.0" + code = file("${path.module}/lambdas/viewer-request/index.js") +} + resource "aws_cloudfront_response_headers_policy" "content_disposition" { name = local.human_readable_name comment = "Set the Content-Disposition header for ${var.domain_name}" @@ -50,10 +56,9 @@ resource "aws_cloudfront_distribution" "distribution" { } } - lambda_function_association { - event_type = "origin-request" - lambda_arn = module.origin_request.version_arn - include_body = false + function_association { + event_type = "viewer-request" + function_arn = aws_cloudfront_function.viewer_request.arn } } From ab9170b92563155449782dbb389b01a2bcd16404 Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 5 Jun 2024 16:10:41 +0200 Subject: [PATCH 065/217] Deploy CloudFront function to production --- terragrunt/accounts/legacy/rustup-prod/deployed-ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/accounts/legacy/rustup-prod/deployed-ref b/terragrunt/accounts/legacy/rustup-prod/deployed-ref index 47f4a9edc..94da9a113 100644 --- a/terragrunt/accounts/legacy/rustup-prod/deployed-ref +++ b/terragrunt/accounts/legacy/rustup-prod/deployed-ref @@ -1 +1 @@ -9fd79c3ea80c41cafe3c1bc0f0686748af8cc6e0 +72f17a0c5537a8aa23271c5836fe50673e95018c From e36d0aa5ae2c73e2f1d86650050f0416802a5c13 Mon Sep 17 00:00:00 2001 From: Jan David Date: Mon, 10 Jun 2024 13:04:36 +0200 Subject: [PATCH 066/217] Allow the crates.io team to manage log pipelines We use Datadog among other reasons for the application logs from crates.io. As new features or services are added, the crates.io team reguarly wants to tweak the pipelines slightly to improve the parsing of logs and extract data into metrics. This requires elevated permissions to the log pipelines and processors. While ideally, we would only grant these permissions for the specific pipeline used by crates.io, this is not possible through the API as far as we know. --- terraform/team-members-datadog/crates-io.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/terraform/team-members-datadog/crates-io.tf b/terraform/team-members-datadog/crates-io.tf index 19d46fd6d..4268a7e5f 100644 --- a/terraform/team-members-datadog/crates-io.tf +++ b/terraform/team-members-datadog/crates-io.tf @@ -13,6 +13,8 @@ resource "datadog_role" "crates_io" { data.datadog_permissions.all.permissions.logs_read_index_data, data.datadog_permissions.all.permissions.logs_read_data, data.datadog_permissions.all.permissions.logs_live_tail, + data.datadog_permissions.all.permissions.logs_write_pipelines, + data.datadog_permissions.all.permissions.logs_write_processors, data.datadog_permissions.all.permissions.logs_read_archives, data.datadog_permissions.all.permissions.dashboards_write, ]) From 4042268225b919c5146d53c18d8fc37e08e5eb39 Mon Sep 17 00:00:00 2001 From: Jan David Date: Mon, 10 Jun 2024 13:25:19 +0200 Subject: [PATCH 067/217] Move Terraform providers into account.json Due to how Terragrunt generates the provider configuration, we use the account.json file to declare additional providers for Terraform. The existing providers for the crates.io module have been moved from Terraform to that file to avoid a duplicate provider error when running Terraform. --- terragrunt/accounts/legacy/account.json | 4 ++++ terragrunt/modules/crates-io/_terraform.tf | 10 ---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/terragrunt/accounts/legacy/account.json b/terragrunt/accounts/legacy/account.json index 3bc0057ef..52e825d18 100644 --- a/terragrunt/accounts/legacy/account.json +++ b/terragrunt/accounts/legacy/account.json @@ -8,6 +8,10 @@ { "region": "us-east-1", "alias": "us-east-1" + }, + { + "region": "eu-west-1", + "alias": "eu-west-1" } ] } diff --git a/terragrunt/modules/crates-io/_terraform.tf b/terragrunt/modules/crates-io/_terraform.tf index c449bd953..9556a9c54 100644 --- a/terragrunt/modules/crates-io/_terraform.tf +++ b/terragrunt/modules/crates-io/_terraform.tf @@ -12,16 +12,6 @@ terraform { } } -provider "aws" { - alias = "us-east-1" - region = "us-east-1" -} - -provider "aws" { - alias = "eu-west-1" - region = "eu-west-1" -} - provider "fastly" {} data "aws_caller_identity" "current" {} From 73aff0e7a3e0d7cf94715a358b690682c7d6be5a Mon Sep 17 00:00:00 2001 From: Jan David Date: Mon, 10 Jun 2024 13:47:47 +0200 Subject: [PATCH 068/217] Rename config.toml The build of the WASM function was broken, since the Fastly CLI does not support `.cargo/config` anymore. It must now be named `config.toml`. --- .../crates-io/compute-static/.cargo/{config => config.toml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename terragrunt/modules/crates-io/compute-static/.cargo/{config => config.toml} (100%) diff --git a/terragrunt/modules/crates-io/compute-static/.cargo/config b/terragrunt/modules/crates-io/compute-static/.cargo/config.toml similarity index 100% rename from terragrunt/modules/crates-io/compute-static/.cargo/config rename to terragrunt/modules/crates-io/compute-static/.cargo/config.toml From aaa1f3e54cd0caf91e9e507baaa08f821c4bedd6 Mon Sep 17 00:00:00 2001 From: Jan David Date: Mon, 10 Jun 2024 14:27:43 +0200 Subject: [PATCH 069/217] Enable new database dump on production crates.io will start offering the database dump as a ZIP file, for which support in the CDN was merged in #421. --- 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 a85f62b8c..4c1d31504 100644 --- a/terragrunt/accounts/legacy/crates-io-prod/deployed-ref +++ b/terragrunt/accounts/legacy/crates-io-prod/deployed-ref @@ -1 +1 @@ -25aa3d29a8dc1f1369faaff0c627a80ef8a72f24 +73aff0e7a3e0d7cf94715a358b690682c7d6be5a From 5f0a3447b286f9662ed58f5d14d02121155a3554 Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 12 Jun 2024 18:18:54 +0200 Subject: [PATCH 070/217] Onboard crates.io on-call team to Datadog Accounts for the on-call team for crates.io have been created in Datadog. The team has read-only access to the logs and dashboards. The crates.io team can assist with any modifications to the log pipeline or any dashboards that the team might need. --- .../team-members-datadog/crates-io-oncall.tf | 39 +++++++++++++++++++ terraform/team-members-datadog/crates-io.tf | 7 +++- terraform/team-members-datadog/users.tf | 33 ++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 terraform/team-members-datadog/crates-io-oncall.tf diff --git a/terraform/team-members-datadog/crates-io-oncall.tf b/terraform/team-members-datadog/crates-io-oncall.tf new file mode 100644 index 000000000..7ffa1e4dc --- /dev/null +++ b/terraform/team-members-datadog/crates-io-oncall.tf @@ -0,0 +1,39 @@ +locals { + crates_io_oncall = { + "andrei_listochkin" = local.users.andrei_listochkin + "felix_gilcher" = local.users.felix_gilcher + "florian_gilcher" = local.users.florian_gilcher + "pietro_albini" = local.users.pietro_albini + "sebastian_ziebell" = local.users.sebastian_ziebell + "thepang_mbambo" = local.users.tshepang_mbambo + } +} + +resource "datadog_role" "crates_io_oncall" { + name = "crates.io on-call" + + dynamic "permission" { + for_each = toset([ + data.datadog_permissions.all.permissions.logs_read_index_data, + data.datadog_permissions.all.permissions.logs_read_data, + data.datadog_permissions.all.permissions.logs_live_tail, + ]) + + content { + id = permission.value + } + } +} + +resource "datadog_team" "crates_io_oncall" { + name = "crates.io on-call" + description = "The on-call team for crates.io" + handle = "crates-io-oncall" +} + +resource "datadog_team_membership" "crates_io_oncall" { + for_each = local.crates_io_oncall + + team_id = datadog_team.crates_io_oncall.id + user_id = datadog_user.users[each.key].id +} diff --git a/terraform/team-members-datadog/crates-io.tf b/terraform/team-members-datadog/crates-io.tf index 4268a7e5f..d945bd6d8 100644 --- a/terraform/team-members-datadog/crates-io.tf +++ b/terraform/team-members-datadog/crates-io.tf @@ -1,7 +1,9 @@ locals { crates_io = { - "adam" = local.users.adam - "tobias" = local.users.tobias + "adam" = local.users.adam + "carol" = local.users.carols10cents + "jtgeibel" = local.users.jtgeibel + "tobias" = local.users.tobias } } @@ -16,6 +18,7 @@ resource "datadog_role" "crates_io" { data.datadog_permissions.all.permissions.logs_write_pipelines, data.datadog_permissions.all.permissions.logs_write_processors, data.datadog_permissions.all.permissions.logs_read_archives, + data.datadog_permissions.all.permissions.logs_write_processors, data.datadog_permissions.all.permissions.dashboards_write, ]) diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index e59da0c3a..c82a57e3a 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -8,6 +8,22 @@ locals { login = "admin@rust-lang.org" name = "Rust Admin" } + "andrei_listochkin" = { + login = "andrei.listochkin@ferrous-systems.com" + name = "Andrei Listochkin" + } + "carols10cents" = { + login = "carol.nichols@gmail.com" + name = "Carol Nichols" + } + "felix_gilcher" = { + login = "felix.gilcher@ferrous-systems.com" + name = "Felix Gilcher" + } + "florian_gilcher" = { + login = "florian.gilcher@ferrous-systems.com" + name = "Florian Gilcher" + } "jakub" = { login = "berykubik@gmail.com" name = "Jakub Beránek" @@ -20,6 +36,10 @@ locals { login = "joelmarcey@rustfoundation.org" name = "Joel Marcey" } + "jtgeibel" = { + login = "jtgeibel@gmail.com" + name = "Justin Geibel" + } "mark" = { login = "mark.simulacrum@gmail.com" name = "Mark Rousskov" @@ -40,10 +60,18 @@ locals { login = "pietro@pietroalbini.org" name = "Pietro Albini" } + "pietro_albini" = { + login = "pietro.albini@ferrous-systems.com" + name = "Pietro Albini" + } "rustfoundation" = { login = "infra@rustfoundation.org" name = "Rust Foundation Infrastructure" } + "sebastian_ziebell" = { + login = "sebastian.ziebell@ferrous-systems.com" + name = "Sebastian Ziebell" + } "seth" = { login = "smarkle.aws@gmail.com" name = "Seth Markle" @@ -52,6 +80,10 @@ locals { login = "tobiasbieniek@rustfoundation.org" name = "Tobias Bieniek" } + "tshepang_mbambo" = { + login = "tshepang.mbambo@ferrous-systems.com" + name = "Tshepang Mbambo" + } "walter" = { login = "walterpearce@rustfoundation.org" name = "Walter Pearce" @@ -71,6 +103,7 @@ locals { _do_not_use_all_teams = [ { for name, user in local.crater : name => merge(user, { roles = [datadog_role.crater.name] }) }, { for name, user in local.crates_io : name => merge(user, { roles = [datadog_role.crates_io.name] }) }, + { for name, user in local.crates_io_oncall : name => merge(user, { roles = [datadog_role.crates_io_oncall.name] }) }, { for name, user in local.foundation : name => merge(user, { roles = [datadog_role.foundation.name] }) }, { for name, user in local.foundation_board : name => merge(user, { roles = [datadog_role.board_member.name] }) }, { for name, user in local.infra : name => merge(user, { roles = [datadog_role.infra.name] }) }, From 0f3e2b0ae5f7c6ddbc84d14e765a9545bb3d67e6 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 18 Jun 2024 14:22:25 +0200 Subject: [PATCH 071/217] Expand Datadog permissions More permissions on Datadog have been granted. Notebooks can be a useful feature for teams to document their processes or create runbooks for debugging. They are free to use, so the permission has been granted to all teams. The staff of the Rust Foundation has additionally been granted the permissions to create metrics from logs, edit their metadata, and share dashboards publicly. These permissions are limited to staff for now, because custom metrics are a paid feature and we want to limit who can share data publicly. --- terraform/team-members-datadog/crater.tf | 1 + terraform/team-members-datadog/crates-io.tf | 2 +- terraform/team-members-datadog/foundation.tf | 4 ++++ terraform/team-members-datadog/infra.tf | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/terraform/team-members-datadog/crater.tf b/terraform/team-members-datadog/crater.tf index 89829f64f..3ede06a08 100644 --- a/terraform/team-members-datadog/crater.tf +++ b/terraform/team-members-datadog/crater.tf @@ -10,6 +10,7 @@ resource "datadog_role" "crater" { dynamic "permission" { for_each = toset([ data.datadog_permissions.all.permissions.dashboards_write, + data.datadog_permissions.all.permissions.notebooks_write, data.datadog_permissions.all.permissions.api_keys_read, data.datadog_permissions.all.permissions.user_app_keys, ]) diff --git a/terraform/team-members-datadog/crates-io.tf b/terraform/team-members-datadog/crates-io.tf index d945bd6d8..f42613ef7 100644 --- a/terraform/team-members-datadog/crates-io.tf +++ b/terraform/team-members-datadog/crates-io.tf @@ -18,8 +18,8 @@ resource "datadog_role" "crates_io" { data.datadog_permissions.all.permissions.logs_write_pipelines, data.datadog_permissions.all.permissions.logs_write_processors, data.datadog_permissions.all.permissions.logs_read_archives, - data.datadog_permissions.all.permissions.logs_write_processors, data.datadog_permissions.all.permissions.dashboards_write, + data.datadog_permissions.all.permissions.notebooks_write, ]) content { diff --git a/terraform/team-members-datadog/foundation.tf b/terraform/team-members-datadog/foundation.tf index 966b040e8..f76f7ef26 100644 --- a/terraform/team-members-datadog/foundation.tf +++ b/terraform/team-members-datadog/foundation.tf @@ -16,6 +16,10 @@ resource "datadog_role" "foundation" { dynamic "permission" { for_each = toset([ data.datadog_permissions.all.permissions.dashboards_write, + data.datadog_permissions.all.permissions.dashboards_public_share, + data.datadog_permissions.all.permissions.notebooks_write, + data.datadog_permissions.all.permissions.logs_generate_metrics, + data.datadog_permissions.all.permissions.metrics_metadata_write, ]) content { diff --git a/terraform/team-members-datadog/infra.tf b/terraform/team-members-datadog/infra.tf index aa4d668dd..2506a7c84 100644 --- a/terraform/team-members-datadog/infra.tf +++ b/terraform/team-members-datadog/infra.tf @@ -18,6 +18,7 @@ resource "datadog_role" "infra" { data.datadog_permissions.all.permissions.logs_live_tail, data.datadog_permissions.all.permissions.logs_read_archives, data.datadog_permissions.all.permissions.dashboards_write, + data.datadog_permissions.all.permissions.notebooks_write, data.datadog_permissions.all.permissions.saved_views_write, data.datadog_permissions.all.permissions.api_keys_read, data.datadog_permissions.all.permissions.api_keys_write, From 6e8dab2464f36dc4f87ded877cd882ce4f53f34c Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 18 Jun 2024 16:50:13 +0200 Subject: [PATCH 072/217] Create S3 bucket for Rustup build artifacts A new S3 bucket is being created as part of the effort to rebuild the Rustup release process. The bucket will store the build artifacts for Rustup, which the GitHub Actions in rust-lang/rustup will produce. Since the bucket is tied to a GitHub repository, only a single bucket in the production environment is being created. --- .../legacy/rustup-prod/rustup/terragrunt.hcl | 8 +++++ terragrunt/modules/rustup/_terraform.tf | 11 +++++++ terragrunt/modules/rustup/s3.tf | 32 +++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 terragrunt/accounts/legacy/rustup-prod/rustup/terragrunt.hcl create mode 100644 terragrunt/modules/rustup/_terraform.tf create mode 100644 terragrunt/modules/rustup/s3.tf diff --git a/terragrunt/accounts/legacy/rustup-prod/rustup/terragrunt.hcl b/terragrunt/accounts/legacy/rustup-prod/rustup/terragrunt.hcl new file mode 100644 index 000000000..99ba53960 --- /dev/null +++ b/terragrunt/accounts/legacy/rustup-prod/rustup/terragrunt.hcl @@ -0,0 +1,8 @@ +terraform { + source = "git::../../../../..//terragrunt/modules/rustup?ref=${trimspace(file("../deployed-ref"))}" +} + +include { + path = find_in_parent_folders() + merge_strategy = "deep" +} diff --git a/terragrunt/modules/rustup/_terraform.tf b/terragrunt/modules/rustup/_terraform.tf new file mode 100644 index 000000000..6e71aed42 --- /dev/null +++ b/terragrunt/modules/rustup/_terraform.tf @@ -0,0 +1,11 @@ +terraform { + required_version = "~> 1.0" + + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 4.20" + } + } +} + diff --git a/terragrunt/modules/rustup/s3.tf b/terragrunt/modules/rustup/s3.tf new file mode 100644 index 000000000..4760e168f --- /dev/null +++ b/terragrunt/modules/rustup/s3.tf @@ -0,0 +1,32 @@ +# The rust-lang/rustup repository on GitHub builds and uploads Rustup artifacts +# to this S3 bucket. +resource "aws_s3_bucket" "builds" { + provider = aws.us-east-1 + + bucket = "rustup-builds" +} + +module "aws_iam_user" { + source = "../gha-iam-user" + org = "rust-lang" + repo = "rustup" +} + +data "aws_iam_policy_document" "upload_builds" { + statement { + sid = "WriteToRustupBuilds" + effect = "Allow" + + actions = [ + "s3:PutObject", + ] + + resources = ["${aws_s3_bucket.builds.arn}/*"] + } +} + +resource "aws_iam_user_policy" "upload_builds" { + name = "upload-rustup-builds" + user = module.aws_iam_user.user_name + policy = data.aws_iam_policy_document.upload_builds.json +} From 5ea25350006bec7c3b45a4cf15082a380444c6ed Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 20 Jun 2024 10:02:52 +0200 Subject: [PATCH 073/217] Temporarily grant legacy permissions The current CI uploads Rustup build to the dev-static bucket. To not break the existing workflow while implementing the new release process, the current permissions are temporarily granted to the new user for Rustup's CI. They should be removed once the new release process has been implemented. --- terragrunt/modules/rustup/s3.tf | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/terragrunt/modules/rustup/s3.tf b/terragrunt/modules/rustup/s3.tf index 4760e168f..02f746ae3 100644 --- a/terragrunt/modules/rustup/s3.tf +++ b/terragrunt/modules/rustup/s3.tf @@ -30,3 +30,22 @@ resource "aws_iam_user_policy" "upload_builds" { user = module.aws_iam_user.user_name policy = data.aws_iam_policy_document.upload_builds.json } + +data "aws_iam_policy_document" "legacy_ci" { + statement { + sid = "WriteToDevStatic" + effect = "Allow" + + actions = [ + "s3:*", + ] + + resources = ["arn:aws:s3:::dev-static-rust-lang-org/rustup/*"] + } +} + +resource "aws_iam_user_policy" "legacy_ci" { + name = "legacy-ci" + user = module.aws_iam_user.user_name + policy = data.aws_iam_policy_document.legacy_ci.json +} From f3d03c104f8d164c236e737e1e0e062d989edd6b Mon Sep 17 00:00:00 2001 From: Jan David Date: Mon, 24 Jun 2024 09:44:18 +0200 Subject: [PATCH 074/217] Switch to OIDC role for uploading builds --- terragrunt/modules/rustup/s3.tf | 53 +++++++++++---------------------- 1 file changed, 18 insertions(+), 35 deletions(-) diff --git a/terragrunt/modules/rustup/s3.tf b/terragrunt/modules/rustup/s3.tf index 02f746ae3..2e9f13fd0 100644 --- a/terragrunt/modules/rustup/s3.tf +++ b/terragrunt/modules/rustup/s3.tf @@ -6,46 +6,29 @@ resource "aws_s3_bucket" "builds" { bucket = "rustup-builds" } -module "aws_iam_user" { - source = "../gha-iam-user" +module "ci_role" { + source = "../gha-oidc-role" org = "rust-lang" repo = "rustup" + branch = "master" } -data "aws_iam_policy_document" "upload_builds" { - statement { - sid = "WriteToRustupBuilds" - effect = "Allow" - - actions = [ - "s3:PutObject", +resource "aws_iam_policy" "upload_builds" { + name = "upload-rustup-builds" + policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Sid = "WriteToRustupBuilds" + Effect = "Allow" + Action = ["s3:PutObject"] + Resource = ["${aws_s3_bucket.builds.arn}/*"] + } ] - - resources = ["${aws_s3_bucket.builds.arn}/*"] - } -} - -resource "aws_iam_user_policy" "upload_builds" { - name = "upload-rustup-builds" - user = module.aws_iam_user.user_name - policy = data.aws_iam_policy_document.upload_builds.json -} - -data "aws_iam_policy_document" "legacy_ci" { - statement { - sid = "WriteToDevStatic" - effect = "Allow" - - actions = [ - "s3:*", - ] - - resources = ["arn:aws:s3:::dev-static-rust-lang-org/rustup/*"] - } + }) } -resource "aws_iam_user_policy" "legacy_ci" { - name = "legacy-ci" - user = module.aws_iam_user.user_name - policy = data.aws_iam_policy_document.legacy_ci.json +resource "aws_iam_role_policy_attachment" "ci_upload_builds" { + role = module.ci_role.role.id + policy_arn = aws_iam_policy.upload_builds.arn } From 68b75d9cca59496b9c84712ea1c2a2d329da70be Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 25 Jun 2024 12:07:12 +0200 Subject: [PATCH 075/217] Deploy new S3 bucket The new infrastructure for Rustup's build artifacts has been created. The Terragrunt configuration is not deployed from a locked Git commit, since only a single environment exists. --- .../rustup-prod/rustup/.terraform.lock.hcl | 25 +++++++++++++++++++ .../legacy/rustup-prod/rustup/terragrunt.hcl | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 terragrunt/accounts/legacy/rustup-prod/rustup/.terraform.lock.hcl diff --git a/terragrunt/accounts/legacy/rustup-prod/rustup/.terraform.lock.hcl b/terragrunt/accounts/legacy/rustup-prod/rustup/.terraform.lock.hcl new file mode 100644 index 000000000..777f97bd4 --- /dev/null +++ b/terragrunt/accounts/legacy/rustup-prod/rustup/.terraform.lock.hcl @@ -0,0 +1,25 @@ +# 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.20" + 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/legacy/rustup-prod/rustup/terragrunt.hcl b/terragrunt/accounts/legacy/rustup-prod/rustup/terragrunt.hcl index 99ba53960..ad2a2f09b 100644 --- a/terragrunt/accounts/legacy/rustup-prod/rustup/terragrunt.hcl +++ b/terragrunt/accounts/legacy/rustup-prod/rustup/terragrunt.hcl @@ -1,5 +1,5 @@ terraform { - source = "git::../../../../..//terragrunt/modules/rustup?ref=${trimspace(file("../deployed-ref"))}" + source = "../../../../..//terragrunt/modules/rustup" } include { From e2bfce3fec17f9a12d167e1f3f2c021d77d8f504 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sat, 29 Jun 2024 14:30:28 -0400 Subject: [PATCH 076/217] Deploy bors-prod account This adds the DNS name configuration and configures deployment via GHA to the production account. --- .../bors-prod/app/.terraform.lock.hcl | 43 +++++++++++++++++++ .../accounts/bors-prod/app/terragrunt.hcl | 12 ++++++ .../accounts/bors-staging/app/terragrunt.hcl | 4 ++ terragrunt/modules/bors/main.tf | 10 +++-- 4 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 terragrunt/accounts/bors-prod/app/.terraform.lock.hcl create mode 100644 terragrunt/accounts/bors-prod/app/terragrunt.hcl diff --git a/terragrunt/accounts/bors-prod/app/.terraform.lock.hcl b/terragrunt/accounts/bors-prod/app/.terraform.lock.hcl new file mode 100644 index 000000000..a5f413320 --- /dev/null +++ b/terragrunt/accounts/bors-prod/app/.terraform.lock.hcl @@ -0,0 +1,43 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/aws" { + version = "5.8.0" + hashes = [ + "h1:vnjWfeuf4AflWsRq3ivVig8dR8PAg8BHTVyAtOzJ1yQ=", + "zh:0974311d5e1becfdcbdae43d022d52689fdad32a4145659e56ac534bcb8cba02", + "zh:100dc64a90fc0d36cf6e2882b4358fde17705edd8ab3c5f2c06d219c36b21565", + "zh:467a86de8a7d77cde5c3386f9e82d7f1bf5972d1b3d177e797d1d9d2e87fd357", + "zh:4ad1f8ef5c5522f81d271b93594a43a7666b3409ca201a1911cd950e489ef12b", + "zh:540a50ab7061c6df2057ec9580890a9e86a687233120af738985fa84dde2a20a", + "zh:6e7b73b770e92891da94751c3e0cff1e1b852f5121da8c4a689056833eeb7d94", + "zh:879d42721e86331b05ff77bd219ca9a062485cdb2fa803d2dcf63084f25d484c", + "zh:980563e615fbba127c02df6dc8872ce60f7137df45fdb8cd801cdcbae6cf192a", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:a6ad25c4d3edde466ea68731097aedad4b68278af0742fc1ab71d2c30491f92e", + "zh:af8df9e06f576c11ce67ac2b675d0d8db4aac618fec95d27c10aa59436feebbf", + "zh:b625ca7c4b99c6b3af34041b9773ccd9d80b0dde264c40b5d163a6abd73793af", + "zh:c9e0ca6aa48ebaa0892ac438392c49052a86605f490950d5317855f35ab7d74a", + "zh:dc500a03d3ed6b1fed3f118a55a7fb93bf172965ae6b2f25cc7f4a152e44edd7", + "zh:e0438bf67d93a29f0d56f9a4544297155ca85c0f10626778d4c3aa68c7e93581", + ] +} + +provider "registry.terraform.io/hashicorp/random" { + version = "3.5.1" + hashes = [ + "h1:IL9mSatmwov+e0+++YX2V6uel+dV6bn+fC/cnGDK3Ck=", + "zh:04e3fbd610cb52c1017d282531364b9c53ef72b6bc533acb2a90671957324a64", + "zh:119197103301ebaf7efb91df8f0b6e0dd31e6ff943d231af35ee1831c599188d", + "zh:4d2b219d09abf3b1bb4df93d399ed156cadd61f44ad3baf5cf2954df2fba0831", + "zh:6130bdde527587bbe2dcaa7150363e96dbc5250ea20154176d82bc69df5d4ce3", + "zh:6cc326cd4000f724d3086ee05587e7710f032f94fc9af35e96a386a1c6f2214f", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:b6d88e1d28cf2dfa24e9fdcc3efc77adcdc1c3c3b5c7ce503a423efbdd6de57b", + "zh:ba74c592622ecbcef9dc2a4d81ed321c4e44cddf7da799faa324da9bf52a22b2", + "zh:c7c5cde98fe4ef1143bd1b3ec5dc04baf0d4cc3ca2c5c7d40d17c0e9b2076865", + "zh:dac4bad52c940cd0dfc27893507c1e92393846b024c5a9db159a93c534a3da03", + "zh:de8febe2a2acd9ac454b844a4106ed295ae9520ef54dc8ed2faf29f12716b602", + "zh:eab0d0495e7e711cca367f7d4df6e322e6c562fc52151ec931176115b83ed014", + ] +} diff --git a/terragrunt/accounts/bors-prod/app/terragrunt.hcl b/terragrunt/accounts/bors-prod/app/terragrunt.hcl new file mode 100644 index 000000000..3ac378254 --- /dev/null +++ b/terragrunt/accounts/bors-prod/app/terragrunt.hcl @@ -0,0 +1,12 @@ +terraform { + source = "../../../modules//bors" +} + +include { + path = find_in_parent_folders() + merge_strategy = "deep" +} + +inputs = { + domain = "bors-prod.rust-lang.net" +} diff --git a/terragrunt/accounts/bors-staging/app/terragrunt.hcl b/terragrunt/accounts/bors-staging/app/terragrunt.hcl index b5fbd7fc0..3ecbd0174 100644 --- a/terragrunt/accounts/bors-staging/app/terragrunt.hcl +++ b/terragrunt/accounts/bors-staging/app/terragrunt.hcl @@ -6,3 +6,7 @@ include { path = find_in_parent_folders() merge_strategy = "deep" } + +inputs = { + domain = "bors-staging.rust-lang.net" +} diff --git a/terragrunt/modules/bors/main.tf b/terragrunt/modules/bors/main.tf index 2befa5735..32b944681 100644 --- a/terragrunt/modules/bors/main.tf +++ b/terragrunt/modules/bors/main.tf @@ -377,7 +377,7 @@ resource "aws_lb_listener" "primary" { } resource "aws_acm_certificate" "primary" { - domain_name = "bors-staging.rust-lang.net" + domain_name = var.domain validation_method = "DNS" lifecycle { @@ -386,7 +386,7 @@ resource "aws_acm_certificate" "primary" { } data "aws_route53_zone" "net" { - name = "bors-staging.rust-lang.net" + name = var.domain private_zone = false } @@ -414,7 +414,7 @@ resource "aws_acm_certificate_validation" "primary" { resource "aws_route53_record" "lb" { zone_id = data.aws_route53_zone.net.zone_id - name = "bors-staging.rust-lang.net" + name = var.domain type = "A" alias { @@ -490,3 +490,7 @@ resource "aws_vpc_security_group_egress_rule" "rds_egress_anywhere_v6" { ip_protocol = -1 to_port = -1 } + +variable "domain" { + description = "domain to use" +} From b3aa7a086827ecebca938fab4d3752f67b352f4f Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sat, 29 Jun 2024 16:41:07 -0400 Subject: [PATCH 077/217] Make bors app ID distinct for each env --- terragrunt/accounts/bors-prod/app/terragrunt.hcl | 1 + terragrunt/accounts/bors-staging/app/terragrunt.hcl | 1 + terragrunt/modules/bors/main.tf | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/terragrunt/accounts/bors-prod/app/terragrunt.hcl b/terragrunt/accounts/bors-prod/app/terragrunt.hcl index 3ac378254..653fdb183 100644 --- a/terragrunt/accounts/bors-prod/app/terragrunt.hcl +++ b/terragrunt/accounts/bors-prod/app/terragrunt.hcl @@ -9,4 +9,5 @@ include { inputs = { domain = "bors-prod.rust-lang.net" + gh_app_id = "278306" } diff --git a/terragrunt/accounts/bors-staging/app/terragrunt.hcl b/terragrunt/accounts/bors-staging/app/terragrunt.hcl index 3ecbd0174..7b89ec2dd 100644 --- a/terragrunt/accounts/bors-staging/app/terragrunt.hcl +++ b/terragrunt/accounts/bors-staging/app/terragrunt.hcl @@ -9,4 +9,5 @@ include { inputs = { domain = "bors-staging.rust-lang.net" + gh_app_id = "343095" } diff --git a/terragrunt/modules/bors/main.tf b/terragrunt/modules/bors/main.tf index 32b944681..355f82062 100644 --- a/terragrunt/modules/bors/main.tf +++ b/terragrunt/modules/bors/main.tf @@ -272,7 +272,7 @@ resource "aws_ecs_task_definition" "bors" { environment = [ { name = "APP_ID" - value = "343095" + value = "${var.gh_app_id}" }, { name = "RUST_LOG" @@ -494,3 +494,7 @@ resource "aws_vpc_security_group_egress_rule" "rds_egress_anywhere_v6" { variable "domain" { description = "domain to use" } + +variable "gh_app_id" { + description = "GitHub App ID" +} From 890cacf85f967cbf20fde3c19aae690462983bcf Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sat, 29 Jun 2024 17:08:00 -0400 Subject: [PATCH 078/217] Change trust policies for bors app --- terragrunt/accounts/bors-prod/app/terragrunt.hcl | 1 + terragrunt/accounts/bors-staging/app/terragrunt.hcl | 1 + terragrunt/modules/bors/main.tf | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/terragrunt/accounts/bors-prod/app/terragrunt.hcl b/terragrunt/accounts/bors-prod/app/terragrunt.hcl index 653fdb183..42adf995d 100644 --- a/terragrunt/accounts/bors-prod/app/terragrunt.hcl +++ b/terragrunt/accounts/bors-prod/app/terragrunt.hcl @@ -10,4 +10,5 @@ include { inputs = { domain = "bors-prod.rust-lang.net" gh_app_id = "278306" + trusted_sub = "repo:rust-lang/bors:environment:production" } diff --git a/terragrunt/accounts/bors-staging/app/terragrunt.hcl b/terragrunt/accounts/bors-staging/app/terragrunt.hcl index 7b89ec2dd..49704a8ef 100644 --- a/terragrunt/accounts/bors-staging/app/terragrunt.hcl +++ b/terragrunt/accounts/bors-staging/app/terragrunt.hcl @@ -10,4 +10,5 @@ include { inputs = { domain = "bors-staging.rust-lang.net" gh_app_id = "343095" + trusted_sub = "repo:rust-lang/bors:environment:staging" } diff --git a/terragrunt/modules/bors/main.tf b/terragrunt/modules/bors/main.tf index 355f82062..350282648 100644 --- a/terragrunt/modules/bors/main.tf +++ b/terragrunt/modules/bors/main.tf @@ -70,7 +70,7 @@ resource "aws_iam_role" "gha" { } Condition = { StringLike = { - "token.actions.githubusercontent.com:sub" : "repo:rust-lang/bors:ref:refs/heads/main" + "token.actions.githubusercontent.com:sub" : "${var.trusted_sub}" } StringEquals = { "token.actions.githubusercontent.com:aud" : "sts.amazonaws.com" @@ -498,3 +498,7 @@ variable "domain" { variable "gh_app_id" { description = "GitHub App ID" } + +variable "trusted_sub" { + description = "GitHub OIDC claim" +} From 835f4b7f84324632da653d44f5e6ed7fd72ff472 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sat, 29 Jun 2024 17:26:32 -0400 Subject: [PATCH 079/217] Add read-only access to infra Also drops access from read-only roles to kms:Decrypt. That operation isn't considered a write operation, but grants e.g. access to SSM secret values, which doesn't seem ideal. --- terragrunt/modules/aws-organization/groups.tf | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/terragrunt/modules/aws-organization/groups.tf b/terragrunt/modules/aws-organization/groups.tf index 9770cd33c..2fe4ec151 100644 --- a/terragrunt/modules/aws-organization/groups.tf +++ b/terragrunt/modules/aws-organization/groups.tf @@ -92,6 +92,21 @@ resource "aws_ssoadmin_managed_policy_attachment" "read_only_access" { permission_set_arn = aws_ssoadmin_permission_set.read_only_access.arn } +resource "aws_ssoadmin_permission_set_inline_policy" "no_kms" { + inline_policy = data.aws_iam_policy_document.no_kms.json + instance_arn = local.instance_arn + permission_set_arn = aws_ssoadmin_permission_set.read_only_access.arn +} + +data "aws_iam_policy_document" "no_kms" { + statement { + sid = "DropKMSDecrypt" + effect = "Deny" + actions = ["kms:Decrypt"] + resources = ["*"] + } +} + // Triagebot team read-only access into the legacy account. resource "aws_ssoadmin_permission_set" "triagebot_access" { instance_arn = local.instance_arn @@ -245,6 +260,8 @@ locals { groups : [ { group : aws_identitystore_group.infra-admins, permissions : [aws_ssoadmin_permission_set.read_only_access, aws_ssoadmin_permission_set.administrator_access] }, + { group : aws_identitystore_group.infra, + permissions : [aws_ssoadmin_permission_set.read_only_access] }, ] }, ] From 62cf891f28d2435ebfa1f9b0b69d5b6a67e94687 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 2 Jul 2024 14:33:00 +0200 Subject: [PATCH 080/217] Onboard Veykril to Datadog Veykril is being added to the on-call team for crates.io. --- terraform/team-members-datadog/crates-io-oncall.tf | 1 + terraform/team-members-datadog/users.tf | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/terraform/team-members-datadog/crates-io-oncall.tf b/terraform/team-members-datadog/crates-io-oncall.tf index 7ffa1e4dc..112bb752b 100644 --- a/terraform/team-members-datadog/crates-io-oncall.tf +++ b/terraform/team-members-datadog/crates-io-oncall.tf @@ -6,6 +6,7 @@ locals { "pietro_albini" = local.users.pietro_albini "sebastian_ziebell" = local.users.sebastian_ziebell "thepang_mbambo" = local.users.tshepang_mbambo + "lukas_wirth" = local.users.lukas_wirth } } diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index c82a57e3a..d3ec68d71 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -40,6 +40,10 @@ locals { login = "jtgeibel@gmail.com" name = "Justin Geibel" } + "lukas_wirth" = { + login = "lukas.wirth@ferrous-systems.com" + name = "Lukas Wirth" + } "mark" = { login = "mark.simulacrum@gmail.com" name = "Mark Rousskov" From 0817cd37292a2832dbb657a51e602abb310c5b55 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sat, 6 Jul 2024 12:52:45 +0200 Subject: [PATCH 081/217] crates-io: Disable versioning for `rss/` contents --- terragrunt/modules/crates-io/s3-static.tf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/terragrunt/modules/crates-io/s3-static.tf b/terragrunt/modules/crates-io/s3-static.tf index 8f10a0f6c..6041f7e6c 100644 --- a/terragrunt/modules/crates-io/s3-static.tf +++ b/terragrunt/modules/crates-io/s3-static.tf @@ -31,6 +31,16 @@ resource "aws_s3_bucket" "static" { } } + lifecycle_rule { + id = "disable-feeds-versioning" + enabled = true + prefix = "rss/" + + versioning { + enabled = false + } + } + lifecycle { ignore_changes = [ replication_configuration, From d0028feb63070a5e45f831c1518aacfcbe14558d Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Sat, 6 Jul 2024 17:41:42 +0200 Subject: [PATCH 082/217] fix terraform config --- .../crates-io-staging/crates-io/.terraform.lock.hcl | 5 ++++- terragrunt/modules/crates-io/s3-static.tf | 8 +++++--- 2 files changed, 9 insertions(+), 4 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 b69857408..db36d7445 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 @@ -5,6 +5,7 @@ provider "registry.terraform.io/fastly/fastly" { version = "5.0.0" constraints = "5.0.0" hashes = [ + "h1:9E2Fj277L+xx7zI7bNHa2iXat/WY6s4au2v1x6u4yjo=", "h1:Q7RTj5hwsrfvuRxVrvc2opR2I85pZ+KqC6vUhnEfTE8=", "zh:22e09df92cf4fc6880afff94c092bd7ab1f93fb2c5ae2b75414494de033c85b9", "zh:251e7ec86eb5f1cb91bdfc2fe581eb048ca8d2df41f701407f6f072a268a8fa3", @@ -25,9 +26,10 @@ provider "registry.terraform.io/fastly/fastly" { provider "registry.terraform.io/hashicorp/aws" { version = "4.45.0" - constraints = "~> 4.32" + constraints = "~> 4.20" hashes = [ "h1:AKX4R3U+kBpQB5oU08kSrzl5CLsMhbK+BKZVrwYDXZQ=", + "h1:J/XjRsEJIpxi+mczXQfnH3nvfACv3LRDtrthQJCIibY=", "zh:22da03786f25658a000d1bcc28c780816a97e7e8a1f59fff6eee7d452830e95e", "zh:2543be56eee0491eb0c79ca1c901dcbf71da26625961fe719f088263fef062f4", "zh:31a1da1e3beedfd88c3c152ab505bdcf330427f26b75835885526f7bb75c4857", @@ -50,6 +52,7 @@ provider "registry.terraform.io/hashicorp/external" { version = "2.2.3" hashes = [ "h1:648ZjJR81c2W1OLtYmUQa9/1rGr3vvZSuX9dR1ucGWY=", + "h1:uvOYRWcVIqOZSl8YjjaB18yZFz1AWIt2CnK7O45rckg=", "zh:184ecd339d764de845db0e5b8a9c87893dcd0c9d822167f73658f89d80ec31c9", "zh:2661eaca31d17d6bbb18a8f673bbfe3fe1b9b7326e60d0ceb302017003274e3c", "zh:2c0a180f6d1fc2ba6e03f7dfc5f73b617e45408681f75bca75aa82f3796df0e4", diff --git a/terragrunt/modules/crates-io/s3-static.tf b/terragrunt/modules/crates-io/s3-static.tf index 6041f7e6c..e3b3c6caf 100644 --- a/terragrunt/modules/crates-io/s3-static.tf +++ b/terragrunt/modules/crates-io/s3-static.tf @@ -31,13 +31,15 @@ resource "aws_s3_bucket" "static" { } } + // Delete old RSS feeds as eagerly as possible, without deleting live ones. lifecycle_rule { - id = "disable-feeds-versioning" + id = "purge-old-rss-feeds" enabled = true prefix = "rss/" - versioning { - enabled = false + abort_incomplete_multipart_upload_days = 1 + noncurrent_version_expiration { + days = 1 } } From 6d7a4803dda4083743c7cbc1bd21b3e6a6760383 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Sat, 13 Jul 2024 17:11:08 +0200 Subject: [PATCH 083/217] create the start-release lambda --- terraform/releases/.terraform.lock.hcl | 60 ++++++------- terraform/releases/_terraform.tf | 2 +- terraform/releases/impl/main.tf | 2 +- terraform/releases/impl/outputs.tf | 4 + .../releases/lambdas/start-release/index.py | 86 +++++++++++++++++++ terraform/releases/start-release.tf | 47 ++++++++++ terraform/shared/modules/lambda/main.tf | 5 +- 7 files changed, 172 insertions(+), 34 deletions(-) create mode 100644 terraform/releases/lambdas/start-release/index.py create mode 100644 terraform/releases/start-release.tf diff --git a/terraform/releases/.terraform.lock.hcl b/terraform/releases/.terraform.lock.hcl index 6d0eebd20..db23c7a19 100644 --- a/terraform/releases/.terraform.lock.hcl +++ b/terraform/releases/.terraform.lock.hcl @@ -2,44 +2,44 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.61.0" - constraints = "~> 4.20" + version = "5.58.0" + constraints = ">= 4.20.0, ~> 5.58, < 6.0.0" hashes = [ - "h1:qyBawxoNN6EpiiX5h5ZG5P2dHsBeA5Z67xESl2c1HRk=", - "zh:051e2588410b7448a5c4c30d668948dd6fdfa8037700bfc00fb228986ccbf3a5", - "zh:082fbcf9706b48d0880ba552a11c29527e228dadd6d83668d0789abda24e5922", - "zh:0e0e72f214fb24f4f9c601cab088a2d8e00ec3327c451bc753911951d773214a", - "zh:3af6d38ca733ca66cce15c6a5735ded7c18348ad26040ebd9a59778b2cd9cf6c", - "zh:404898bc2258bbb9527fa06c72cb927ca011fd9bc3f4b90931c0912652c3f9e9", - "zh:4f617653b0f17a7708bc896f029c4ab0b677a1a1c987bd77166acad1d82db469", - "zh:5dbe393355ac137aa3fd329e3d24871f27012d3ba93d714485b55820df240349", - "zh:6067c2127eb5c879227aca671f101de6dcba909d0d8d15d5711480351962a248", + "h1:6vsFc7SmmlElqg3k0X6azrO0yarM7UPCUF4XsAYryjA=", + "zh:15e9be54a8febe8e560362b10967cb60b680ca3f78fe207d7209b76e076f59d3", + "zh:240f6899a2cec259aa2729ce031f6af2b453f90a8b59118bb2571c54acc65db8", + "zh:2b6e8e2ab1a3dce1001503dba6086a128bb2a71652b0d0b3b107db665b7d6881", + "zh:579b0ed95247a0bd8bfb3fac7fb767547dde76026c578f4f184b5743af5e32cc", + "zh:6adcd10fd12be0be9eb78a89e745a5b77ae0d8b3522cd782456a71178aad8ccb", + "zh:7f829cef82f0a02faa97d0fbe1417a40b73fc5142e883b12eebc5b71015efac9", + "zh:81977f001998c9096f7b59710996e159774a9313c1bc03db3beb81c3e016ebef", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a939f94461f91aa3b7ec7096271e2714309bd917fe9a03e02f68afb556d65e0f", - "zh:b21227b9082e5fafe8b7c415dc6a99c0d82da05492457377a5fe7d4acaed80e2", - "zh:b8d9f09ed5fc8c654b768b7bee1237eaf1e2287c898249e740695055fb0fe072", - "zh:d360e1e185b148ff6b1d0ed4f7d574e08f2391697ab43df62085b04a1a5b1284", - "zh:da962da17ddda744911cb1e92b983fa3874d73a28f3ee72faa9ddb6680a63774", - "zh:e2f1c4f5ebeb4fd7ef690178168a4c529025b54a91bb7a087dcea48e0b82737a", + "zh:a5d98ac6fab6e6c85164ca7dd38f94a1e44bd70c0e8354c61f7fbabf698957cd", + "zh:c27fa4fed50f6f83ca911bef04f05d635a7b7a01a89dc8fc5d66a277588f08df", + "zh:d4042bdf86ca6dc10e0cca91c4fcc592b12572d26185b3d37bbbb9e2026ac68b", + "zh:d536482cf4ace0d49a2a86c931150921649beae59337d0c02a785879fe943cf3", + "zh:e205f8243274a621fb9ef2b5e2c71e84c1670be1d23697739439f5a831fa620f", + "zh:eb76ce0c77fd76c47f57122c91c4fcf0f72c01423538ed7833eaa7eeaae2edf6", + "zh:ffe04e494af6cc7348ceb8d85f4c1d5a847a44510827b4496513c810a4d9196d", ] } provider "registry.terraform.io/hashicorp/external" { - version = "2.3.1" + version = "2.3.3" constraints = "~> 2.3.1" hashes = [ - "h1:gznGscVJ0USxy4CdihpjRKPsKvyGr/zqPvBoFLJTQDc=", - "zh:001e2886dc81fc98cf17cf34c0d53cb2dae1e869464792576e11b0f34ee92f54", - "zh:2eeac58dd75b1abdf91945ac4284c9ccb2bfb17fa9bdb5f5d408148ff553b3ee", - "zh:2fc39079ba61411a737df2908942e6970cb67ed2f4fb19090cd44ce2082903dd", - "zh:472a71c624952cff7aa98a7b967f6c7bb53153dbd2b8f356ceb286e6743bb4e2", - "zh:4cff06d31272aac8bc35e9b7faec42cf4554cbcbae1092eaab6ab7f643c215d9", + "h1:H+3QlVPs/7CDa3I4KU/a23wYeGeJxeBlgvR7bfK1t1w=", + "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/terraform/releases/_terraform.tf b/terraform/releases/_terraform.tf index fe78c8a14..83256808e 100644 --- a/terraform/releases/_terraform.tf +++ b/terraform/releases/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.58" } external = { source = "hashicorp/external" diff --git a/terraform/releases/impl/main.tf b/terraform/releases/impl/main.tf index d53c54d1d..3963a11e2 100644 --- a/terraform/releases/impl/main.tf +++ b/terraform/releases/impl/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.58" configuration_aliases = [aws.east1] } } diff --git a/terraform/releases/impl/outputs.tf b/terraform/releases/impl/outputs.tf index c5c36b342..7c5c4d730 100644 --- a/terraform/releases/impl/outputs.tf +++ b/terraform/releases/impl/outputs.tf @@ -1,3 +1,7 @@ output "promote_release_role_id" { value = aws_iam_role.promote_release.unique_id } + +output "codebuild_project_arn" { + value = aws_codebuild_project.promote_release.arn +} diff --git a/terraform/releases/lambdas/start-release/index.py b/terraform/releases/lambdas/start-release/index.py new file mode 100644 index 000000000..2f267935c --- /dev/null +++ b/terraform/releases/lambdas/start-release/index.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python3 + +# We want to grant folks on the release team the ability to start publishing +# releases, but simply granting them permission to start the CodeBuild job +# grants way too many privileges. For example, it would allow them to bypass +# startup checks, override the commit being released, or worse override the +# command being executed by CodeBuild to exfiltrate secrets. +# +# To solve the problem, this script accepts a limited set of actions allowed to +# be executed, and invokes CodeBuild with the right environment variables. This +# means we can safely grant the release team access to this function. + +import boto3 +import time + + +codebuild = boto3.client("codebuild") + + +def handler(event, context): + match event["action"]: + case "update-rust-branches": + # The channel for updating branches is not actually used by + # promote-release, but we have to pass it anyway. + return run_build("promote-branches", "prod", "nightly") + + case "publish-rust-dev-nightly": + return run_build("promote-release", "dev", "nightly") + + case "publish-rust-dev-beta": + return run_build("promote-release", "dev", "beta") + + case "publish-rust-dev-stable": + return run_build( + "promote-release", + "dev", + "stable", + { + "PROMOTE_RELEASE_BLOG_REPOSITORY": "rust-lang/blog.rust-lang.org", + "PROMOTE_RELEASE_BLOG_SCHEDULED_RELEASE_DATE": event["date"], + }, + ) + + case "publish-rust-dev-stable-rebuild": + return run_build( + "promote-release", + "dev", + "stable", + { + "PROMOTE_RELEASE_BYPASS_STARTUP_CHECKS": "1", + }, + ) + + case "publish-rust-prod-stable": + return run_build("promote-release", "prod", "stable") + + case action: + raise RuntimeError(f"unsupported action: {action}") + + +def run_build(action, env, channel, extra_vars=None): + vars = { + "PROMOTE_RELEASE_ACTION": action, + "PROMOTE_RELEASE_CHANNEL": channel, + } + if extra_vars is not None: + vars.update(extra_vars) + + build = codebuild.start_build( + projectName=f"promote-release--{env}", + environmentVariablesOverride=[ + {"name": name, "value": value, "type": "PLAINTEXT"} + for name, value in vars.items() + ], + )["build"] + + # Continue fetching information about the build + while "streamName" not in build["logs"]: + time.sleep(1) + build = codebuild.batch_get_builds(ids=[build["id"]])["builds"][0] + + return { + "build_id": build["id"], + "logs_group": build["logs"]["groupName"], + "logs_link": build["logs"]["deepLink"], + } diff --git a/terraform/releases/start-release.tf b/terraform/releases/start-release.tf new file mode 100644 index 000000000..607b6b7fc --- /dev/null +++ b/terraform/releases/start-release.tf @@ -0,0 +1,47 @@ +resource "aws_iam_role" "start_release" { + name = "start-release-lambda" + + assume_role_policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Effect = "Allow" + Action = "sts:AssumeRole" + Principal = { + Service = "lambda.amazonaws.com" + } + } + ] + }) + + inline_policy { + name = "permissions" + policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Effect = "Allow" + Action = [ + "codebuild:StartBuild", + "codebuild:BatchGetBuilds", + ] + Resource = [ + module.dev.codebuild_project_arn, + module.prod.codebuild_project_arn, + ] + } + ] + }) + } +} + +module "lambda_start_release" { + source = "../shared/modules/lambda" + + name = "start-release" + source_dir = "lambdas/start-release" + handler = "index.handler" + runtime = "python3.12" + role_arn = aws_iam_role.start_release.arn + timeout_seconds = 900 # 15 minutes +} diff --git a/terraform/shared/modules/lambda/main.tf b/terraform/shared/modules/lambda/main.tf index ec598729f..ad3ecd6db 100644 --- a/terraform/shared/modules/lambda/main.tf +++ b/terraform/shared/modules/lambda/main.tf @@ -1,8 +1,9 @@ terraform { required_providers { aws = { - source = "hashicorp/aws" - version = "~> 4.20" + source = "hashicorp/aws" + // Allow both 4.x and 5.x while we upgrade everything to 5.x. + version = ">= 4.20, < 6" } } } From 579cd8c2091c2942a22035277225e6a7cb2b5dd3 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Sun, 14 Jul 2024 19:15:56 +0200 Subject: [PATCH 084/217] grant permissions to the release team --- .../root/aws-organization/terragrunt.hcl | 4 +- terragrunt/modules/aws-organization/groups.tf | 65 +++++++++++++++++++ terragrunt/modules/aws-organization/users.tf | 1 + 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/terragrunt/accounts/root/aws-organization/terragrunt.hcl b/terragrunt/accounts/root/aws-organization/terragrunt.hcl index f55e838ae..f3567624d 100644 --- a/terragrunt/accounts/root/aws-organization/terragrunt.hcl +++ b/terragrunt/accounts/root/aws-organization/terragrunt.hcl @@ -19,13 +19,13 @@ inputs = { given_name = "Pietro", family_name = "Albini" email = "pietro@pietroalbini.org" - groups = ["infra", "infra-admins"] + groups = ["infra", "infra-admins", "release"] } "simulacrum" = { given_name = "Mark", family_name = "Rousskov" email = "mark.simulacrum@gmail.com" - groups = ["infra", "infra-admins", "triagebot"] + groups = ["infra", "infra-admins", "release", "triagebot"] } "rylev" = { given_name = "Ryan", diff --git a/terragrunt/modules/aws-organization/groups.tf b/terragrunt/modules/aws-organization/groups.tf index 2fe4ec151..71e7e27e5 100644 --- a/terragrunt/modules/aws-organization/groups.tf +++ b/terragrunt/modules/aws-organization/groups.tf @@ -42,6 +42,13 @@ resource "aws_identitystore_group" "triagebot" { description = "The triagebot maintainers" } +resource "aws_identitystore_group" "release" { + identity_store_id = local.identity_store_id + + display_name = "release" + description = "The release team" +} + # The different permission sets a group may have assigned to it resource "aws_ssoadmin_permission_set" "administrator_access" { @@ -156,6 +163,62 @@ resource "aws_ssoadmin_permission_set_inline_policy" "triagebot_access" { permission_set_arn = aws_ssoadmin_permission_set.triagebot_access.arn } +// Release team permission to start a new release + +resource "aws_ssoadmin_permission_set" "start_release" { + instance_arn = local.instance_arn + name = "StartRelease" +} + +resource "aws_ssoadmin_permission_set_inline_policy" "start_release" { + instance_arn = local.instance_arn + permission_set_arn = aws_ssoadmin_permission_set.start_release.arn + + inline_policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Effect = "Allow" + Action = "lambda:InvokeFunction" + Resource = "arn:aws:lambda:us-west-1:890664054962:function:start-release" + }, + { + Effect = "Allow" + Action = [ + // This must NOT include codebuild:StartBuild, starting builds must + // be done through the lambda. + "codebuild:BatchGetBuild", + "codebuild:StopBuild", + ] + Resource = [ + "arn:aws:codebuild:us-west-1:890664054962:project/promote-release--dev", + "arn:aws:codebuild:us-west-1:890664054962:project/promote-release--prod", + ] + }, + { + Effect = "Allow" + Action = [ + // Subset of CloudwatchReadOnlyAccess + // See https://docs.aws.amazon.com/aws-managed-policy/latest/reference/CloudWatchReadOnlyAccess.html + "logs:Get*", + "logs:List*", + "logs:StartQuery", + "logs:Describe*", + "logs:FilterLogEvents", + "logs:StartLiveTail", + "logs:StopLiveTail", + ] + Resource = [ + "arn:aws:logs:us-west-1:890664054962:log-group:/dev/promote-release", + "arn:aws:logs:us-west-1:890664054962:log-group:/dev/promote-release:*", + "arn:aws:logs:us-west-1:890664054962:log-group:/prod/promote-release", + "arn:aws:logs:us-west-1:890664054962:log-group:/prod/promote-release:*", + ] + }, + ] + }) +} + # The assignment of groups to accounts with their respective permission sets locals { @@ -184,6 +247,8 @@ locals { permissions : [aws_ssoadmin_permission_set.view_only_access] }, { group : aws_identitystore_group.triagebot, permissions : [aws_ssoadmin_permission_set.triagebot_access] }, + { group : aws_identitystore_group.release, + permissions : [aws_ssoadmin_permission_set.start_release] }, ] }, # crates-io Staging diff --git a/terragrunt/modules/aws-organization/users.tf b/terragrunt/modules/aws-organization/users.tf index b6e9b4de5..ed4c41d4c 100644 --- a/terragrunt/modules/aws-organization/users.tf +++ b/terragrunt/modules/aws-organization/users.tf @@ -5,6 +5,7 @@ locals { infra-admins : aws_identitystore_group.infra-admins crates-io : aws_identitystore_group.crates_io triagebot : aws_identitystore_group.triagebot + release : aws_identitystore_group.release } # Expand var.users into collection of group memberships associations From 5b1e444515f40e7da02a26f02705540b2382cb2c Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Sun, 14 Jul 2024 21:59:44 +0200 Subject: [PATCH 085/217] add an explicit deny --- terragrunt/modules/aws-organization/groups.tf | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/terragrunt/modules/aws-organization/groups.tf b/terragrunt/modules/aws-organization/groups.tf index 71e7e27e5..1c1e1c262 100644 --- a/terragrunt/modules/aws-organization/groups.tf +++ b/terragrunt/modules/aws-organization/groups.tf @@ -185,8 +185,6 @@ resource "aws_ssoadmin_permission_set_inline_policy" "start_release" { { Effect = "Allow" Action = [ - // This must NOT include codebuild:StartBuild, starting builds must - // be done through the lambda. "codebuild:BatchGetBuild", "codebuild:StopBuild", ] @@ -195,6 +193,16 @@ resource "aws_ssoadmin_permission_set_inline_policy" "start_release" { "arn:aws:codebuild:us-west-1:890664054962:project/promote-release--prod", ] }, + { + // This is a safeguard to ensure members of the release team can never + // start any CodeBuild job directly, but rather have to go through the + // lambda. This is because the StartBuild permission not only allows + // starting the build (which would be fine), but also override any part + // of the build definition, including the executed steps. + Effect = "Deny" + Action = "codebuild:StartBuild" + Resource = "*" + }, { Effect = "Allow" Action = [ From 9b0f96ad6d59cda64e141c2a56c86529ee6b0dc3 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Sun, 14 Jul 2024 21:59:55 +0200 Subject: [PATCH 086/217] the BatchGetBuilds permission is not actually needed --- terragrunt/modules/aws-organization/groups.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/terragrunt/modules/aws-organization/groups.tf b/terragrunt/modules/aws-organization/groups.tf index 1c1e1c262..d8ef9fb4b 100644 --- a/terragrunt/modules/aws-organization/groups.tf +++ b/terragrunt/modules/aws-organization/groups.tf @@ -185,7 +185,6 @@ resource "aws_ssoadmin_permission_set_inline_policy" "start_release" { { Effect = "Allow" Action = [ - "codebuild:BatchGetBuild", "codebuild:StopBuild", ] Resource = [ From 0ffbcf7075e0ded79432b115f738cf6e7f130b91 Mon Sep 17 00:00:00 2001 From: Denis Cornehl Date: Wed, 17 Jul 2024 08:29:50 +0200 Subject: [PATCH 087/217] docs.rs: allow POST requests --- terraform/docs-rs/cloudfront.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/docs-rs/cloudfront.tf b/terraform/docs-rs/cloudfront.tf index a6a4789e5..8a03a303f 100644 --- a/terraform/docs-rs/cloudfront.tf +++ b/terraform/docs-rs/cloudfront.tf @@ -90,7 +90,7 @@ resource "aws_cloudfront_distribution" "webapp" { default_cache_behavior { target_origin_id = "ec2" - allowed_methods = ["GET", "HEAD", "OPTIONS"] + allowed_methods = ["GET", "HEAD", "OPTIONS", "POST"] cached_methods = ["GET", "HEAD", "OPTIONS"] compress = true viewer_protocol_policy = "redirect-to-https" From 38d367ffe96a647e582c3829c9c8d5b48e291be5 Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 17 Jul 2024 16:01:55 +0200 Subject: [PATCH 088/217] Remove warning for unnecessary lifecycle rule The `latest_restorable_time` cannot be compared between Terraform plans anyways and thus doesn't need to be ignored. Terraform started printing a warning for this configuration, so the attribute has been removed. In its place, the engine version of the database is being ignored since it is periodically updated manually through the AWS console. --- terraform/docs-rs/rds.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/docs-rs/rds.tf b/terraform/docs-rs/rds.tf index 58dd69f07..7c5c7bed7 100644 --- a/terraform/docs-rs/rds.tf +++ b/terraform/docs-rs/rds.tf @@ -82,7 +82,7 @@ resource "aws_db_instance" "db" { lifecycle { ignore_changes = [ - latest_restorable_time + engine_version, ] } } From ce143ba4bdaad9dd321accbfb2cc5ac7b531f1fa Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 17 Jul 2024 16:28:40 +0200 Subject: [PATCH 089/217] Fix value for allowed methods AWS only allows three different sets of methods as values for the `allowed_methods` field. Adding the `POST` method requires to also allow the other methods. --- terraform/docs-rs/cloudfront.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/docs-rs/cloudfront.tf b/terraform/docs-rs/cloudfront.tf index f0e5c850d..6a8bd991a 100644 --- a/terraform/docs-rs/cloudfront.tf +++ b/terraform/docs-rs/cloudfront.tf @@ -90,7 +90,7 @@ resource "aws_cloudfront_distribution" "webapp" { default_cache_behavior { target_origin_id = "ec2" - allowed_methods = ["GET", "HEAD", "OPTIONS", "POST"] + allowed_methods = ["GET", "HEAD", "OPTIONS", "DELETE", "PATCH", "POST", "PUT"] cached_methods = ["GET", "HEAD", "OPTIONS"] compress = true viewer_protocol_policy = "redirect-to-https" From 885afdb78971bc9eff6dedf357bfaa695f93acde Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 18 Jul 2024 09:52:22 +0200 Subject: [PATCH 090/217] give marco ieni terraform access --- terraform/shared/terraform-state.tf | 1 + terraform/team-members-access/_users.tf | 1 + terragrunt/accounts/root/aws-organization/terragrunt.hcl | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/terraform/shared/terraform-state.tf b/terraform/shared/terraform-state.tf index 45d98a1a3..721d9e54c 100644 --- a/terraform/shared/terraform-state.tf +++ b/terraform/shared/terraform-state.tf @@ -10,6 +10,7 @@ locals { "pietroalbini", "simulacrum", "jdn", + "marcoieni", ] } diff --git a/terraform/team-members-access/_users.tf b/terraform/team-members-access/_users.tf index 1c0be40e9..c7b3c3b60 100644 --- a/terraform/team-members-access/_users.tf +++ b/terraform/team-members-access/_users.tf @@ -7,6 +7,7 @@ locals { "pietroalbini" = [aws_iam_group.infra_admins.name], "simulacrum" = [aws_iam_group.infra_admins.name], "jdn" = [aws_iam_group.infra_admins.name], + "marcoieni" = [aws_iam_group.infra_admins.name], "technetos" = [aws_iam_group.mods_discord.name], "carols10cents" = [aws_iam_group.crates_io.name], "jtgeibel" = [aws_iam_group.crates_io.name], diff --git a/terragrunt/accounts/root/aws-organization/terragrunt.hcl b/terragrunt/accounts/root/aws-organization/terragrunt.hcl index f3567624d..425e266e8 100644 --- a/terragrunt/accounts/root/aws-organization/terragrunt.hcl +++ b/terragrunt/accounts/root/aws-organization/terragrunt.hcl @@ -81,5 +81,11 @@ inputs = { email = "apiraino@protonmail.com" groups = ["triagebot"] } + "marcoieni" = { + given_name = "Marco", + family_name = "Ieni" + email = "marcoieni@rustfoundation.org" + groups = ["infra", "infra-admins"] + } } } From 94e5acb19fb3761a5aa68c4b099cfb9b8596cfd6 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 18 Jul 2024 11:40:24 +0200 Subject: [PATCH 091/217] add marco ieni to fastly --- terraform/team-members-fastly/users.tf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/terraform/team-members-fastly/users.tf b/terraform/team-members-fastly/users.tf index b13bd0bc7..f44c1dc22 100644 --- a/terraform/team-members-fastly/users.tf +++ b/terraform/team-members-fastly/users.tf @@ -12,6 +12,11 @@ locals { role = "superuser" } + "marcoieni" = { + login = "marcoieni@rustfoundation.org" + name = "Marco Ieni" + role = "superuser" + } "mark" = { login = "mark.simulacrum@gmail.com" name = "Mark Rousskov" From ad22f60d774af557d346cc7c67495e2c6de891e7 Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 18 Jul 2024 12:07:46 +0200 Subject: [PATCH 092/217] Grant Marco access to Datadog A new user account for @MarcoIeni has been created on Datadog, and he has been added to the relevant roles and teams. --- terraform/team-members-datadog/foundation.tf | 1 + terraform/team-members-datadog/infra-admins.tf | 1 + terraform/team-members-datadog/infra.tf | 11 ++++++----- terraform/team-members-datadog/users.tf | 4 ++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/terraform/team-members-datadog/foundation.tf b/terraform/team-members-datadog/foundation.tf index f76f7ef26..7cf3ab4fc 100644 --- a/terraform/team-members-datadog/foundation.tf +++ b/terraform/team-members-datadog/foundation.tf @@ -3,6 +3,7 @@ locals { "adam" = local.users.adam "jdn" = local.users.jdn "joel" = local.users.joel + "marcoieni" = local.users.marcoieni "paullenz" = local.users.paullenz "rustfoundation" = local.users.rustfoundation "tobias" = local.users.tobias diff --git a/terraform/team-members-datadog/infra-admins.tf b/terraform/team-members-datadog/infra-admins.tf index c6919fedf..857226766 100644 --- a/terraform/team-members-datadog/infra-admins.tf +++ b/terraform/team-members-datadog/infra-admins.tf @@ -3,6 +3,7 @@ locals { "admin" = local.users.admin "jdn" = local.users.jdn "joel" = local.users.joel + "marcoieni" = local.users.marcoieni "mark" = local.users.mark "pietro" = local.users.pietro "rustfoundation" = local.users.rustfoundation diff --git a/terraform/team-members-datadog/infra.tf b/terraform/team-members-datadog/infra.tf index 2506a7c84..1827d0051 100644 --- a/terraform/team-members-datadog/infra.tf +++ b/terraform/team-members-datadog/infra.tf @@ -1,10 +1,11 @@ locals { infra = { - "admin" = local.users.admin - "jakub" = local.users.jakub - "jdn" = local.users.jdn - "mark" = local.users.mark - "pietro" = local.users.pietro + "admin" = local.users.admin + "jakub" = local.users.jakub + "jdn" = local.users.jdn + "marcoieni" = local.users.marcoieni + "mark" = local.users.mark + "pietro" = local.users.pietro } } diff --git a/terraform/team-members-datadog/users.tf b/terraform/team-members-datadog/users.tf index d3ec68d71..40f1d3d68 100644 --- a/terraform/team-members-datadog/users.tf +++ b/terraform/team-members-datadog/users.tf @@ -44,6 +44,10 @@ locals { login = "lukas.wirth@ferrous-systems.com" name = "Lukas Wirth" } + "marcoieni" = { + login = "marcoieni@rustfoundation.org" + name = "Marco Ieni" + } "mark" = { login = "mark.simulacrum@gmail.com" name = "Mark Rousskov" From 11ed6e4e48b4bbe08a87b6c874162b02d403209d Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:11:43 +0200 Subject: [PATCH 093/217] fix(aws-cred): accept any mfa name --- aws-creds.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/aws-creds.py b/aws-creds.py index f0e46f828..587c71559 100755 --- a/aws-creds.py +++ b/aws-creds.py @@ -72,10 +72,7 @@ def load_mfa_device(): serial = None for device in mfa_out["MFADevices"]: - # Only TOTP devices are supported user = device["UserName"] - if not device["SerialNumber"].endswith(f":mfa/{user}"): - continue # Only a single TOTP device is supported if serial is None: From 0ad1aafc5c2b7a092d8373273424a9ee10a5623d Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:47:46 +0200 Subject: [PATCH 094/217] fix(docs-rs-staging): fix terragrunt configuration --- .../accounts/docs-rs-staging/account.json | 10 ++++++++++ .../docs-rs/.terraform.lock.hcl | 9 +++++++-- .../accounts/docs-rs-staging/terragrunt.hcl | 14 -------------- terragrunt/modules/docs-rs/_terraform.tf | 18 ++++++++++++++++++ terragrunt/modules/docs-rs/rds.tf | 6 ++++++ terragrunt/modules/vpc/_terraform.tf | 10 ++++++++++ 6 files changed, 51 insertions(+), 16 deletions(-) create mode 100644 terragrunt/accounts/docs-rs-staging/account.json delete mode 100644 terragrunt/accounts/docs-rs-staging/terragrunt.hcl create mode 100644 terragrunt/modules/docs-rs/_terraform.tf create mode 100644 terragrunt/modules/vpc/_terraform.tf diff --git a/terragrunt/accounts/docs-rs-staging/account.json b/terragrunt/accounts/docs-rs-staging/account.json new file mode 100644 index 000000000..6ccfc88cd --- /dev/null +++ b/terragrunt/accounts/docs-rs-staging/account.json @@ -0,0 +1,10 @@ +{ + "aws": { + "profile": "docs-rs-staging", + "regions": [ + { + "region": "us-east-1" + } + ] + } +} 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 b15caa2e1..3071db7a8 100644 --- a/terragrunt/accounts/docs-rs-staging/docs-rs/.terraform.lock.hcl +++ b/terragrunt/accounts/docs-rs-staging/docs-rs/.terraform.lock.hcl @@ -2,8 +2,10 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.49.0" + version = "4.49.0" + constraints = "~> 4.20, ~> 4.32" hashes = [ + "h1:1vbzsJ8TBjjotPQKWZQUrX2AII8+te1ih4bYJYD2VS4=", "h1:oCosb3zFIsClMQiREtdiK4Av5TTzBAHtsYLd1Z5gff8=", "h1:oOwWQpvQWd1uVP1axBz/TO6xzzLWoL982AY/MQfeF7I=", "zh:09803937f00fdf2873eccf685eec7854408925cbf183c9b683df7c5825be463f", @@ -25,8 +27,10 @@ provider "registry.terraform.io/hashicorp/aws" { } provider "registry.terraform.io/hashicorp/random" { - version = "3.4.3" + version = "3.4.3" + constraints = "~> 3.4" hashes = [ + "h1:saZR+mhthL0OZl4SyHXZraxyaBNVMxiZzks78nWcZ2o=", "h1:tL3katm68lX+4lAncjQA9AXL4GR/VM+RPwqYf4D2X8Q=", "h1:xZGZf18JjMS06pFa4NErzANI98qi59SEcBsOcS2P2yQ=", "zh:41c53ba47085d8261590990f8633c8906696fa0a3c4b384ff6a7ecbf84339752", @@ -48,6 +52,7 @@ provider "registry.terraform.io/integrations/github" { version = "4.31.0" constraints = "~> 4.0" hashes = [ + "h1:FkBft5JlVtlcYcEM0CiphlFWgjBFQVziJMwrowuBIoc=", "h1:fm77HQzGPdMeRGbu6xn/3CtQsHfHbaZdfIhIbgJj1kY=", "h1:nO3MyFnQToKUSIImFS2ib7RAMOy02Me6Up4qGBvdKMw=", "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", diff --git a/terragrunt/accounts/docs-rs-staging/terragrunt.hcl b/terragrunt/accounts/docs-rs-staging/terragrunt.hcl deleted file mode 100644 index 655571528..000000000 --- a/terragrunt/accounts/docs-rs-staging/terragrunt.hcl +++ /dev/null @@ -1,14 +0,0 @@ -remote_state { - backend = "s3" - generate = { - path = "terragrunt-generated-backend.tf" - if_exists = "overwrite_terragrunt" - } - config = { - bucket = "terraform-state-${get_aws_account_id()}" - dynamodb_table = "terraform-lock" - region = "us-east-1" - key = "${path_relative_to_include()}.tfstate" - } -} - diff --git a/terragrunt/modules/docs-rs/_terraform.tf b/terragrunt/modules/docs-rs/_terraform.tf new file mode 100644 index 000000000..162482c82 --- /dev/null +++ b/terragrunt/modules/docs-rs/_terraform.tf @@ -0,0 +1,18 @@ +terraform { + required_version = "~> 1.0" + + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 4.32" + } + random = { + source = "hashicorp/random" + version = "~> 3.4" + } + github = { + source = "integrations/github" + version = "~> 4.0" + } + } +} diff --git a/terragrunt/modules/docs-rs/rds.tf b/terragrunt/modules/docs-rs/rds.tf index 76c8a0ea6..dfa25e9d0 100644 --- a/terragrunt/modules/docs-rs/rds.tf +++ b/terragrunt/modules/docs-rs/rds.tf @@ -61,6 +61,12 @@ resource "aws_db_instance" "db" { enabled_cloudwatch_logs_exports = ["postgresql", "upgrade"] performance_insights_enabled = true + + lifecycle { + ignore_changes = [ + engine_version, + ] + } } resource "aws_ssm_parameter" "connection_url" { diff --git a/terragrunt/modules/vpc/_terraform.tf b/terragrunt/modules/vpc/_terraform.tf new file mode 100644 index 000000000..f60947a4d --- /dev/null +++ b/terragrunt/modules/vpc/_terraform.tf @@ -0,0 +1,10 @@ +terraform { + required_version = "~> 1.0" + + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 4.32" + } + } +} From 201c0fe599e22abcd5a77f98d530627e0a193063 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Fri, 26 Jul 2024 21:50:57 +0200 Subject: [PATCH 095/217] remove access to former t-infra members --- terraform/team-members-access/_users.tf | 2 -- terragrunt/accounts/root/aws-organization/terragrunt.hcl | 6 ------ 2 files changed, 8 deletions(-) diff --git a/terraform/team-members-access/_users.tf b/terraform/team-members-access/_users.tf index c7b3c3b60..5c07a7031 100644 --- a/terraform/team-members-access/_users.tf +++ b/terraform/team-members-access/_users.tf @@ -3,7 +3,6 @@ locals { users = { - "jynelson" = [aws_iam_group.docs_rs.name, aws_iam_group.infra_team.name], "pietroalbini" = [aws_iam_group.infra_admins.name], "simulacrum" = [aws_iam_group.infra_admins.name], "jdn" = [aws_iam_group.infra_admins.name], @@ -12,7 +11,6 @@ locals { "carols10cents" = [aws_iam_group.crates_io.name], "jtgeibel" = [aws_iam_group.crates_io.name], "Turbo87" = [aws_iam_group.crates_io.name], - "rylev" = [aws_iam_group.rustc_perf.name, aws_iam_group.infra_team.name], "JoelMarcey" = [aws_iam_group.foundation.name], "rebeccarumbul" = [aws_iam_group.foundation.name], "abibroom" = [aws_iam_group.foundation.name], diff --git a/terragrunt/accounts/root/aws-organization/terragrunt.hcl b/terragrunt/accounts/root/aws-organization/terragrunt.hcl index 425e266e8..f04688f54 100644 --- a/terragrunt/accounts/root/aws-organization/terragrunt.hcl +++ b/terragrunt/accounts/root/aws-organization/terragrunt.hcl @@ -27,12 +27,6 @@ inputs = { email = "mark.simulacrum@gmail.com" groups = ["infra", "infra-admins", "release", "triagebot"] } - "rylev" = { - given_name = "Ryan", - family_name = "Levick" - email = "me@ryanlevick.com" - groups = ["infra"] - } "shepmaster" = { given_name = "Jake", family_name = "Goulding", From d16edcfbcbd64b8247e9ac0ddec14e393b256ccd Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Fri, 26 Jul 2024 22:16:31 +0200 Subject: [PATCH 096/217] provision release team members --- .../accounts/root/aws-organization/terragrunt.hcl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/terragrunt/accounts/root/aws-organization/terragrunt.hcl b/terragrunt/accounts/root/aws-organization/terragrunt.hcl index f04688f54..12f8d61be 100644 --- a/terragrunt/accounts/root/aws-organization/terragrunt.hcl +++ b/terragrunt/accounts/root/aws-organization/terragrunt.hcl @@ -81,5 +81,17 @@ inputs = { email = "marcoieni@rustfoundation.org" groups = ["infra", "infra-admins"] } + "boxyuwu" = { + given_name = "Boxy" + family_name = "UwU" + email = "rust@boxyuwu.dev" + groups = ["release"] + } + "cuviper" = { + given_name = "Josh" + family_name = "Stone" + email = "cuviper@gmail.com" + groups = ["release"] + } } } From 7f18c94bde51735184563778b9bdd6195b7cd1fc Mon Sep 17 00:00:00 2001 From: Jan David Date: Mon, 29 Jul 2024 14:23:10 +0200 Subject: [PATCH 097/217] Decommission self-hosted GitHub Actions runner Since GitHub has launched native ARM-based runners for GitHub Actions, we can decommission the self-hosted runners that we maintained ourselves. The agents on the server have been stopped, it has been removed from monitoring, the DNS record has been deleted, and its configuration in this repository is being removed. --- .../host_vars/gha-self-hosted.local.yml | 14 ---- ansible/envs/dev-example/hosts | 3 - .../ci-arm-1.infra.rust-lang.org.yml | 22 ------ .../ci-arm-2.infra.rust-lang.org.yml | 19 ----- ansible/envs/prod/hosts | 4 - ansible/playbooks/gha-self-hosted.yml | 40 ---------- ansible/playbooks/monitoring.yml | 1 - .../roles/gha-self-hosted/handlers/main.yml | 4 - ansible/roles/gha-self-hosted/tasks/host.yml | 79 ------------------- .../roles/gha-self-hosted/tasks/install.yml | 47 ----------- .../roles/gha-self-hosted/tasks/instances.yml | 21 ----- ansible/roles/gha-self-hosted/tasks/main.yml | 5 -- .../gha-self-hosted/templates/build-image.sh | 32 -------- .../gha-self-hosted/templates/instances.json | 20 ----- .../roles/gha-self-hosted/templates/sudoers | 5 -- .../systemd/gha-self-hosted-boot-time.service | 20 ----- .../gha-self-hosted-rebuild-image.service | 11 --- .../gha-self-hosted-rebuild-image.timer | 13 --- .../systemd/gha-self-hosted-update.service | 12 --- .../systemd/gha-self-hosted-update.timer | 12 --- .../templates/systemd/gha-vm.service | 50 ------------ .../templates/update-source.sh | 19 ----- 22 files changed, 453 deletions(-) delete mode 100644 ansible/envs/dev-example/host_vars/gha-self-hosted.local.yml delete mode 100644 ansible/envs/prod/host_vars/ci-arm-1.infra.rust-lang.org.yml delete mode 100644 ansible/envs/prod/host_vars/ci-arm-2.infra.rust-lang.org.yml delete mode 100644 ansible/playbooks/gha-self-hosted.yml delete mode 100644 ansible/roles/gha-self-hosted/handlers/main.yml delete mode 100644 ansible/roles/gha-self-hosted/tasks/host.yml delete mode 100644 ansible/roles/gha-self-hosted/tasks/install.yml delete mode 100644 ansible/roles/gha-self-hosted/tasks/instances.yml delete mode 100644 ansible/roles/gha-self-hosted/tasks/main.yml delete mode 100644 ansible/roles/gha-self-hosted/templates/build-image.sh delete mode 100644 ansible/roles/gha-self-hosted/templates/instances.json delete mode 100644 ansible/roles/gha-self-hosted/templates/sudoers delete mode 100644 ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-boot-time.service delete mode 100644 ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-rebuild-image.service delete mode 100644 ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-rebuild-image.timer delete mode 100644 ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-update.service delete mode 100644 ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-update.timer delete mode 100644 ansible/roles/gha-self-hosted/templates/systemd/gha-vm.service delete mode 100644 ansible/roles/gha-self-hosted/templates/update-source.sh diff --git a/ansible/envs/dev-example/host_vars/gha-self-hosted.local.yml b/ansible/envs/dev-example/host_vars/gha-self-hosted.local.yml deleted file mode 100644 index 4bdf8a65e..000000000 --- a/ansible/envs/dev-example/host_vars/gha-self-hosted.local.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- - -vars_github_token: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - -vars_cpu_cores: 2 -vars_ram: 2G -vars_root_disk: 10G -vars_timeout_seconds: 14400 -vars_ci_repo: ghost/test-repo - -vars_instances: - - - name: instance-1 - image: ubuntu diff --git a/ansible/envs/dev-example/hosts b/ansible/envs/dev-example/hosts index 5350578f3..4edb6a139 100644 --- a/ansible/envs/dev-example/hosts +++ b/ansible/envs/dev-example/hosts @@ -6,6 +6,3 @@ [crater] # crater-agent.local - -[gha_self_hosted] -# gha-self-hosted.local diff --git a/ansible/envs/prod/host_vars/ci-arm-1.infra.rust-lang.org.yml b/ansible/envs/prod/host_vars/ci-arm-1.infra.rust-lang.org.yml deleted file mode 100644 index f27aa459a..000000000 --- a/ansible/envs/prod/host_vars/ci-arm-1.infra.rust-lang.org.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- - -# Fetch all the group params from AWS SSM -ssm_ci_arm_1: "{{ lookup('aws_ssm', '/prod/ansible/ci-arm-1/', region='us-west-1', shortnames=true, bypath=true, recursive=true) }}" - -vars_github_token: "{{ ssm_ci_arm_1['github-token'] }}" -vars_root_password: "{{ ssm_ci_arm_1['root-password'] }}" -vars_root_password_salt: "{{ ssm_ci_arm_1['root-password-salt'] }}" - -vars_cpu_cores: 14 -vars_ram: 16G -vars_root_disk: 100G -vars_timeout_seconds: 14400 -vars_ci_repo: rust-lang-ci/rust - -vars_instances: - - - name: arm-1-1 - image: ubuntu - - - name: arm-1-2 - image: ubuntu diff --git a/ansible/envs/prod/host_vars/ci-arm-2.infra.rust-lang.org.yml b/ansible/envs/prod/host_vars/ci-arm-2.infra.rust-lang.org.yml deleted file mode 100644 index e7de0f68b..000000000 --- a/ansible/envs/prod/host_vars/ci-arm-2.infra.rust-lang.org.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- - -# Fetch all the group params from AWS SSM -ssm_ci_arm_1: "{{ lookup('aws_ssm', '/prod/ansible/ci-arm-1/', region='us-west-1', shortnames=true, bypath=true, recursive=true) }}" - -vars_github_token: "{{ ssm_ci_arm_1['github-token'] }}" -vars_root_password: "{{ ssm_ci_arm_1['root-password'] }}" -vars_root_password_salt: "{{ ssm_ci_arm_1['root-password-salt'] }}" - -vars_cpu_cores: 14 -vars_ram: 16G -vars_root_disk: 100G -vars_timeout_seconds: 14400 -vars_ci_repo: rust-lang-ci/rust - -vars_instances: - - - name: arm-2-1 - image: ubuntu diff --git a/ansible/envs/prod/hosts b/ansible/envs/prod/hosts index 14741eb30..3e2df76b4 100644 --- a/ansible/envs/prod/hosts +++ b/ansible/envs/prod/hosts @@ -8,10 +8,6 @@ monitoring.infra.rust-lang.org crater-azure-1.infra.rust-lang.org crater-azure-2.infra.rust-lang.org -[gha_self_hosted] -ci-arm-1.infra.rust-lang.org -ci-arm-2.infra.rust-lang.org - [playground] play-1.infra.rust-lang.org diff --git a/ansible/playbooks/gha-self-hosted.yml b/ansible/playbooks/gha-self-hosted.yml deleted file mode 100644 index c79b1b2db..000000000 --- a/ansible/playbooks/gha-self-hosted.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- - -- hosts: gha_self_hosted - become: yes - become_user: root - - roles: - - - role: common - papertrail_url: "{{ vars_papertrail_url }}" - collect_metrics_from: "{{ global_collect_metrics_from }}" - sudo_users: "{{ global_sudo_users }}" - - # Useful to access the root account through the serial port. - root_password: "{{ vars_root_password }}" - root_password_salt: "{{ vars_root_password_salt }}" - - - role: datadog.datadog - vars: - datadog_api_key: "{{ vars_datadog_api_key }}" - datadog_site: "datadoghq.com" - - datadog_config: - tags: - - "env:{{ vars_environment }}" - - "service:gha-self-hosted" - process_config: - enabled: "true" - - - role: gha-self-hosted - source_repo: https://github.com/rust-lang/gha-self-hosted - - # Defined in `envs/prod/host_vars/{hostname}.yml` - cpu_cores: "{{ vars_cpu_cores }}" - ram: "{{ vars_ram }}" - root_disk: "{{ vars_root_disk }}" - timeout_seconds: "{{ vars_timeout_seconds }}" - ci_repo: "{{ vars_ci_repo }}" - github_token: "{{ vars_github_token }}" - instances: "{{ vars_instances }}" diff --git a/ansible/playbooks/monitoring.yml b/ansible/playbooks/monitoring.yml index c68c7d80a..4dc38c566 100644 --- a/ansible/playbooks/monitoring.yml +++ b/ansible/playbooks/monitoring.yml @@ -58,7 +58,6 @@ # List of instances to scrape for system metrics - targets: - "{{ inventory_hostname }}:9100" - - ci-arm-1.infra.rust-lang.org:9100 - crater.infra.rust-lang.org:9100 - docsrs.infra.rust-lang.org:9100 - bastion.infra.rust-lang.org:9100 diff --git a/ansible/roles/gha-self-hosted/handlers/main.yml b/ansible/roles/gha-self-hosted/handlers/main.yml deleted file mode 100644 index d1a49d515..000000000 --- a/ansible/roles/gha-self-hosted/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -- name: reload-systemd - shell: systemctl daemon-reload diff --git a/ansible/roles/gha-self-hosted/tasks/host.yml b/ansible/roles/gha-self-hosted/tasks/host.yml deleted file mode 100644 index ada31821d..000000000 --- a/ansible/roles/gha-self-hosted/tasks/host.yml +++ /dev/null @@ -1,79 +0,0 @@ ---- - -- name: create the gha-self-hosted group - group: - name: gha-self-hosted - system: true - state: present - -- name: create the gha-self-hosted user - user: - name: gha-self-hosted - group: gha-self-hosted - groups: - - kvm - system: true - create_home: false - state: present - -- name: upload sudoers configuration for gha-self-hosted - template: - src: sudoers - dest: /etc/sudoers.d/gha-self-hosted - -- name: create the required directories - file: - path: "{{ item }}" - owner: gha-self-hosted - group: gha-self-hosted - mode: 0755 - state: directory - - loop: - - /opt/gha-self-hosted - - /opt/gha-self-hosted/rootfs - - /opt/gha-self-hosted/bin - -- name: clone the source repository - git: - repo: "{{ source_repo }}" - dest: /opt/gha-self-hosted/source - - become_user: gha-self-hosted - -- name: upload systemd services - template: - src: "systemd/{{ item }}" - dest: "/etc/systemd/system/{{ item }}" - - loop: - - gha-self-hosted-update.service - - gha-self-hosted-update.timer - - gha-self-hosted-rebuild-image.service - - gha-self-hosted-rebuild-image.timer - - gha-self-hosted-boot-time.service - notify: - - reload-systemd - -- name: upload binaries - template: - src: "{{ item }}.sh" - dest: "/opt/gha-self-hosted/bin/{{ item }}" - owner: gha-self-hosted - group: gha-self-hosted - mode: 0755 - - loop: - - update-source - - build-image - -- name: enable systemd timers and services - service: - name: "{{ item }}" - enabled: true - state: started - - loop: - - gha-self-hosted-update.timer - - gha-self-hosted-rebuild-image.timer - - gha-self-hosted-boot-time.service diff --git a/ansible/roles/gha-self-hosted/tasks/install.yml b/ansible/roles/gha-self-hosted/tasks/install.yml deleted file mode 100644 index 8b09a9c19..000000000 --- a/ansible/roles/gha-self-hosted/tasks/install.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- - -- name: install APT packages required for self-hosted agents - apt: - name: - - genisoimage - - git - - make - - qemu-system - - qemu-utils - - qemu-efi-aarch64 - - unzip - state: present - -- name: check which version of packer is installed - command: packer --version - ignore_errors: yes - changed_when: false - failed_when: false - register: packer_capture - -- block: - - - name: "download packer {{ packer_version }} for {{ ansible_architecture }}" - get_url: - url: "https://releases.hashicorp.com/packer/{{ packer_version }}/packer_{{ packer_version }}_linux_{{ packer_archs[ansible_architecture].name }}.zip" - checksum: "{{ packer_archs[ansible_architecture].checksum }}" - dest: /tmp/ansible-install-packer.zip - mode: 0400 - - - name: extract packer - unarchive: - src: /tmp/ansible-install-packer.zip - dest: /usr/local/bin - remote_src: true - - - name: cleanup packer installation files - file: - path: /tmp/ansible-install-packer.zip - state: absent - - when: packer_capture.rc != 0 or packer_capture.stdout.strip() != packer_version - -- name: set the correct permissions for packer - file: - path: /usr/local/bin/packer - mode: 0755 diff --git a/ansible/roles/gha-self-hosted/tasks/instances.yml b/ansible/roles/gha-self-hosted/tasks/instances.yml deleted file mode 100644 index e6696784b..000000000 --- a/ansible/roles/gha-self-hosted/tasks/instances.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: upload instances configuration - template: - src: instances.json - dest: /opt/gha-self-hosted/instances.json - -- name: upload the instances systemd services - template: - src: systemd/gha-vm.service - dest: "/etc/systemd/system/gha-vm-{{ item.name }}.service" - loop: "{{ instances }}" - notify: - - reload-systemd - -- name: start and enable the systemd services - service: - name: "gha-vm-{{ item.name }}.service" - enabled: true - state: started - loop: "{{ instances }}" diff --git a/ansible/roles/gha-self-hosted/tasks/main.yml b/ansible/roles/gha-self-hosted/tasks/main.yml deleted file mode 100644 index eb7d4b93b..000000000 --- a/ansible/roles/gha-self-hosted/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- include_tasks: install.yml -- include_tasks: host.yml -- include_tasks: instances.yml diff --git a/ansible/roles/gha-self-hosted/templates/build-image.sh b/ansible/roles/gha-self-hosted/templates/build-image.sh deleted file mode 100644 index 95d168a1b..000000000 --- a/ansible/roles/gha-self-hosted/templates/build-image.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# -# {{ ansible_managed }} -# - -set -euo pipefail -IFS=$'\n\t' - -SOURCE="/opt/gha-self-hosted/source" -ARCH="$(uname -m)" - -for image in "$(ls "${SOURCE}/images")"; do - dest="/opt/gha-self-hosted/rootfs/${image}.qcow2" - if [[ "${BOOT_TIME-0}" = "1" ]] && [[ -f "${dest}" ]]; then - echo "image ${image} already exists" - continue - fi - echo "building image ${image}" - - cd "${SOURCE}/images/${image}" - make - mv "${SOURCE}/images/${image}/build/${ARCH}/rootfs.qcow2" "${dest}" -done - -# Restart all the VMs -# This will *not* restart them if they're currently running a build or if we're -# running the script at boot time. -if [[ "${BOOT_TIME-0}" != "1" ]]; then - {% for instance in instances %} - sudo systemctl reload gha-vm-{{ instance.name }}.service - {% endfor %} -fi diff --git a/ansible/roles/gha-self-hosted/templates/instances.json b/ansible/roles/gha-self-hosted/templates/instances.json deleted file mode 100644 index fb15dc71b..000000000 --- a/ansible/roles/gha-self-hosted/templates/instances.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - {% for instance in instances %} - { - "name": "{{ instance.name }}", - "image": "/opt/gha-self-hosted/rootfs/{{ instance.image }}.qcow2", - "arch": "{{ ansible_architecture }}", - "cpu-cores": {{ cpu_cores }}, - "ram": "{{ ram }}", - "root-disk": "{{ root_disk }}", - "timeout-seconds": {{ timeout_seconds }}, - "ssh-port": {{ 2200 + loop.index }}, - "config": { - "repo": "{{ ci_repo }}", - "token": "{{ "${{ gha-install-token:" + ci_repo + " }}" }}", - "whitelisted-event": "push" - } - } - {% if not loop.last %},{% endif %} - {% endfor %} -] diff --git a/ansible/roles/gha-self-hosted/templates/sudoers b/ansible/roles/gha-self-hosted/templates/sudoers deleted file mode 100644 index e07c35d53..000000000 --- a/ansible/roles/gha-self-hosted/templates/sudoers +++ /dev/null @@ -1,5 +0,0 @@ -# -# {{ ansible_managed }} -# - -gha-self-hosted ALL= NOPASSWD: /bin/systemctl start gha-self-hosted-rebuild-image.service{% for instance in instances %}, /bin/systemctl reload gha-vm-{{ instance.name }}.service{% endfor %} diff --git a/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-boot-time.service b/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-boot-time.service deleted file mode 100644 index 7fcc41c6a..000000000 --- a/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-boot-time.service +++ /dev/null @@ -1,20 +0,0 @@ -# -# {{ ansible_managed }} -# - -[Unit] -Description=Prepare gha-self-hosted during boot -After=network.target - -[Service] -Type=oneshot -RemainAfterExit=true - -ExecStart=/opt/gha-self-hosted/bin/build-image -Environment=BOOT_TIME=1 - -User=gha-self-hosted -Group=gha-self-hosted - -[Install] -WantedBy=multi-user.target diff --git a/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-rebuild-image.service b/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-rebuild-image.service deleted file mode 100644 index cdb02846a..000000000 --- a/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-rebuild-image.service +++ /dev/null @@ -1,11 +0,0 @@ -# -# {{ ansible_managed }} -# - -[Unit] -Description=Rebuild the image used in gha-self-hosted - -[Service] -ExecStart=/opt/gha-self-hosted/bin/build-image -User=gha-self-hosted -Group=gha-self-hosted diff --git a/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-rebuild-image.timer b/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-rebuild-image.timer deleted file mode 100644 index de4ab62c0..000000000 --- a/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-rebuild-image.timer +++ /dev/null @@ -1,13 +0,0 @@ -# -# {{ ansible_managed }} -# - -[Unit] -Description=Rebuild the gha-self-hosted images every week - -[Timer] -OnCalendar=daily -Persistent=true - -[Install] -WantedBy=timers.target diff --git a/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-update.service b/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-update.service deleted file mode 100644 index c1b0b9ab7..000000000 --- a/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-update.service +++ /dev/null @@ -1,12 +0,0 @@ -# -# {{ ansible_managed }} -# - -[Unit] -Description=Update the source code of gha-self-hosted - -[Service] -Type=oneshot -ExecStart=/opt/gha-self-hosted/bin/update-source -User=gha-self-hosted -Group=gha-self-hosted diff --git a/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-update.timer b/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-update.timer deleted file mode 100644 index c538b040e..000000000 --- a/ansible/roles/gha-self-hosted/templates/systemd/gha-self-hosted-update.timer +++ /dev/null @@ -1,12 +0,0 @@ -# -# {{ ansible_managed }} -# - -[Unit] -Description=Update the source code fo gha-self-hosted every 15 minutes - -[Timer] -OnCalendar=*:0/15 - -[Install] -WantedBy=timers.target diff --git a/ansible/roles/gha-self-hosted/templates/systemd/gha-vm.service b/ansible/roles/gha-self-hosted/templates/systemd/gha-vm.service deleted file mode 100644 index ec4f3b54c..000000000 --- a/ansible/roles/gha-self-hosted/templates/systemd/gha-vm.service +++ /dev/null @@ -1,50 +0,0 @@ -# -# {{ ansible_managed }} -# - -[Unit] -Description=Start a GHA self-hosted runner virtual machine -# Ensure the base image is present when starting the VM. -After=gha-self-hosted-boot-time.service -Wants=gha-self-hosted-boot-time.service - -[Service] -ExecStart=/opt/gha-self-hosted/source/executor/run.py {{ item.name }} -ExecReload=/bin/kill -USR1 $MAINPID -Restart=always - -WorkingDirectory=/opt/gha-self-hosted - -Environment=GITHUB_TOKEN={{ github_token }} - -# Enable extra sandboxing at the systemd level. This will: -# -# - Create a random user and group each time the service is started, deleting -# such user when the service stops. This prevents an attacker from having any -# privilege in the host system if they happened to escape the VM. -# -# - Mount the whole filesystem except /tmp and /var/tmp as read-only, -# preventing an attacker from compromising the system if they happened to -# escape the VM. This also prevents issues with files being owned by the -# emphemeral user IDs. -# -# - Create a private /tmp filesystem and mount it in /tmp and /var/tmp, -# preventing anyone else from accessing its content. This will prevent other -# processes from interacting with the VM's underlying storage and parameters, -# including attackers if they happened to escape the VM. -# -# See DynamicUser= in `man systemd.exec` for more information on this. -DynamicUser=true - -# Enable access to KVM -SupplementaryGroups=kvm - -# First send a SIGINT to the main process (our Python script), then after the -# timeout send a SIGKILL to all the processes in the control group. This allows -# to try and cleanly shutdown the VM while guaranteeing all processes will be -# eventually killed. -KillMode=mixed -KillSignal=SIGINT - -[Install] -WantedBy=multi-user.target diff --git a/ansible/roles/gha-self-hosted/templates/update-source.sh b/ansible/roles/gha-self-hosted/templates/update-source.sh deleted file mode 100644 index ee44fa3cc..000000000 --- a/ansible/roles/gha-self-hosted/templates/update-source.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# {{ ansible_managed }} -# - -set -euo pipefail -IFS=$'\n\t' - -cd /opt/gha-self-hosted/source - -start_sha="$(git rev-parse HEAD)" -git pull -end_sha="$(git rev-parse HEAD)" - -# If there were changes in the images/ directory between the two commits, -# rebuild the local images. -if git diff "${start_sha}..${end_sha}" --name-only | grep "^images/" >/dev/null; then - sudo systemctl start gha-self-hosted-rebuild-image.service -fi From ec642118e91888b9c9c38efc3e1a625f89c5908b Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 29 Jul 2024 15:49:57 +0200 Subject: [PATCH 098/217] docs: add link to accounts --- terragrunt/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/terragrunt/README.md b/terragrunt/README.md index 2df3d89c3..1df8c6eff 100644 --- a/terragrunt/README.md +++ b/terragrunt/README.md @@ -62,7 +62,7 @@ into composable _modules_. Modules at the root of the `modules` directory are called _services_ and define an app or service within our infrastructure. For example, we have a module for -our [dev desktops](./modules/dev-desktops-azure) that contains every piece of +our [dev desktops](./modules/dev-desktops-azure) that contains every piece of infrastructure that is required to run one or more instances on Azure. _Services_ can be deployed multiple times. Each deployment is a concrete @@ -82,7 +82,7 @@ a TLS certificate for a list of domain names. We have two tools to define dependencies between pieces of our infrastructure: 1. With [Terragrunt], we can define [dependencies](https://terragrunt.gruntwork.io/docs/features/execute-terraform-commands-on-multiple-modules-at-once/#dependencies-between-modules) - between [_states_](#accounts). + between [_states_](#accounts). 2. A [Terraform] module can include other modules. ### State @@ -139,9 +139,9 @@ Each account in `./accounts` has a `account.json` file that contains the name of the respective profile. In the above example, `./account/root/account.json` sets the profile name to `rust-root`. -The `sso_account_id` can be found in the web interface of AWS SSO. Open the -`sso_start_url` in a browser, log in, and you'll see a list of accounts with -their respective account ids. +The `sso_account_id` can be found in the [web interface](https://rust-lang.awsapps.com/start/#/?tab=accounts) +of AWS SSO. Open the `sso_start_url` in a browser, log in, and you'll see a list +of accounts with their respective account ids. ### Run Terragrunt From b7f769ae9e9489627763bcd8840ec0bb5115fcc7 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:36:29 +0200 Subject: [PATCH 099/217] chore: delete simple-ci github action --- github-actions/README.md | 1 - github-actions/simple-ci/README.md | 66 ---------------------- github-actions/simple-ci/action.yml | 11 ---- github-actions/simple-ci/dist/index.js | 1 - github-actions/simple-ci/index.js | 25 -------- github-actions/simple-ci/package-lock.json | 32 ----------- github-actions/simple-ci/package.json | 19 ------- 7 files changed, 155 deletions(-) delete mode 100644 github-actions/simple-ci/README.md delete mode 100644 github-actions/simple-ci/action.yml delete mode 100644 github-actions/simple-ci/dist/index.js delete mode 100644 github-actions/simple-ci/index.js delete mode 100644 github-actions/simple-ci/package-lock.json delete mode 100644 github-actions/simple-ci/package.json diff --git a/github-actions/README.md b/github-actions/README.md index eb47f87e8..d2838bd7e 100644 --- a/github-actions/README.md +++ b/github-actions/README.md @@ -6,6 +6,5 @@ actions, since they're supposed to only be used in infra managed by us. * [**upload-docker-image**](upload-docker-image): upload a Docker image to ECR. * [**static-websites**](static-websites): deploy a directory to GitHub Pages. -* [**simple-ci**](simple-ci): Build and test a Rust project. [docs]: https://help.github.com/en/articles/about-actions diff --git a/github-actions/simple-ci/README.md b/github-actions/simple-ci/README.md deleted file mode 100644 index 6ef7845bb..000000000 --- a/github-actions/simple-ci/README.md +++ /dev/null @@ -1,66 +0,0 @@ -# simple-ci - -The `simple-ci` action allows you to easily build and test your Rust projects. - -See [`action.yml`] for configuration options. - -[`action.yml`]: ./action.yml - -## Examples - -### Simple - -This builds, tests, and checks the formatting of your project. - -```yaml -- uses: rust-lang/simpleinfra/github-actions/simple-ci@master - with: - check_fmt: true -``` - -### Complete Template - -This template builds and tests your project on stable, beta, and nightly across -linux, macos, windows. - -```yaml -name: CI - -on: [push, pull_request] - -jobs: - build: - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v2 - - run: rustup default ${{ matrix.channel }} - - uses: rust-lang/simpleinfra/github-actions/simple-ci@master - strategy: - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - channel: [stable, beta, nightly] -``` - -## Development - -The action is written in NodeJS 16, and you can install the dependencies with: - -```sh -npm install -``` - -### Running - -```sh -npm start -``` - -GitHub Actions requires all the dependencies to be committed, so before -creating a commit you need to run: - -```sh -npm run build -``` - -The command will bundle everything in `dist/index.js`. That file will need to -be committed. diff --git a/github-actions/simple-ci/action.yml b/github-actions/simple-ci/action.yml deleted file mode 100644 index 9b5d17c3b..000000000 --- a/github-actions/simple-ci/action.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Simple CI -description: Easily build and test Rust projects. - -inputs: - check_fmt: - description: Check code formatting - required: false - -runs: - using: node16 - main: dist/index.js diff --git a/github-actions/simple-ci/dist/index.js b/github-actions/simple-ci/dist/index.js deleted file mode 100644 index 29274c054..000000000 --- a/github-actions/simple-ci/dist/index.js +++ /dev/null @@ -1 +0,0 @@ -module.exports=function(e,t){"use strict";var i={};function __webpack_require__(t){if(i[t]){return i[t].exports}var n=i[t]={i:t,l:false,exports:{}};e[t].call(n.exports,n,n.exports,__webpack_require__);n.l=true;return n.exports}__webpack_require__.ab=__dirname+"/";function startup(){return __webpack_require__(104)}return startup()}({1:function(e,t,i){"use strict";var n=this&&this.__awaiter||function(e,t,i,n){function adopt(e){return e instanceof i?e:new i(function(t){t(e)})}return new(i||(i=Promise))(function(i,s){function fulfilled(e){try{step(n.next(e))}catch(e){s(e)}}function rejected(e){try{step(n["throw"](e))}catch(e){s(e)}}function step(e){e.done?i(e.value):adopt(e.value).then(fulfilled,rejected)}step((n=n.apply(e,t||[])).next())})};Object.defineProperty(t,"__esModule",{value:true});const s=i(129);const r=i(622);const o=i(669);const c=i(672);const u=o.promisify(s.exec);function cp(e,t,i={}){return n(this,void 0,void 0,function*(){const{force:n,recursive:s}=readCopyOptions(i);const o=(yield c.exists(t))?yield c.stat(t):null;if(o&&o.isFile()&&!n){return}const u=o&&o.isDirectory()?r.join(t,r.basename(e)):t;if(!(yield c.exists(e))){throw new Error(`no such file or directory: ${e}`)}const f=yield c.stat(e);if(f.isDirectory()){if(!s){throw new Error(`Failed to copy. ${e} is a directory, but tried to copy without recursive flag.`)}else{yield cpDirRecursive(e,u,0,n)}}else{if(r.relative(e,u)===""){throw new Error(`'${u}' and '${e}' are the same file`)}yield copyFile(e,u,n)}})}t.cp=cp;function mv(e,t,i={}){return n(this,void 0,void 0,function*(){if(yield c.exists(t)){let n=true;if(yield c.isDirectory(t)){t=r.join(t,r.basename(e));n=yield c.exists(t)}if(n){if(i.force==null||i.force){yield rmRF(t)}else{throw new Error("Destination already exists")}}}yield mkdirP(r.dirname(t));yield c.rename(e,t)})}t.mv=mv;function rmRF(e){return n(this,void 0,void 0,function*(){if(c.IS_WINDOWS){try{if(yield c.isDirectory(e,true)){yield u(`rd /s /q "${e}"`)}else{yield u(`del /f /a "${e}"`)}}catch(e){if(e.code!=="ENOENT")throw e}try{yield c.unlink(e)}catch(e){if(e.code!=="ENOENT")throw e}}else{let t=false;try{t=yield c.isDirectory(e)}catch(e){if(e.code!=="ENOENT")throw e;return}if(t){yield u(`rm -rf "${e}"`)}else{yield c.unlink(e)}}})}t.rmRF=rmRF;function mkdirP(e){return n(this,void 0,void 0,function*(){yield c.mkdirP(e)})}t.mkdirP=mkdirP;function which(e,t){return n(this,void 0,void 0,function*(){if(!e){throw new Error("parameter 'tool' is required")}if(t){const t=yield which(e,false);if(!t){if(c.IS_WINDOWS){throw new Error(`Unable to locate executable file: ${e}. Please verify either the file path exists or the file can be found within a directory specified by the PATH environment variable. Also verify the file has a valid extension for an executable file.`)}else{throw new Error(`Unable to locate executable file: ${e}. Please verify either the file path exists or the file can be found within a directory specified by the PATH environment variable. Also check the file mode to verify the file is executable.`)}}}try{const t=[];if(c.IS_WINDOWS&&process.env.PATHEXT){for(const e of process.env.PATHEXT.split(r.delimiter)){if(e){t.push(e)}}}if(c.isRooted(e)){const i=yield c.tryGetExecutablePath(e,t);if(i){return i}return""}if(e.includes("/")||c.IS_WINDOWS&&e.includes("\\")){return""}const i=[];if(process.env.PATH){for(const e of process.env.PATH.split(r.delimiter)){if(e){i.push(e)}}}for(const n of i){const i=yield c.tryGetExecutablePath(n+r.sep+e,t);if(i){return i}}return""}catch(e){throw new Error(`which failed with message ${e.message}`)}})}t.which=which;function readCopyOptions(e){const t=e.force==null?true:e.force;const i=Boolean(e.recursive);return{force:t,recursive:i}}function cpDirRecursive(e,t,i,s){return n(this,void 0,void 0,function*(){if(i>=255)return;i++;yield mkdirP(t);const n=yield c.readdir(e);for(const r of n){const n=`${e}/${r}`;const o=`${t}/${r}`;const u=yield c.lstat(n);if(u.isDirectory()){yield cpDirRecursive(n,o,i,s)}else{yield copyFile(n,o,s)}}yield c.chmod(t,(yield c.stat(e)).mode)})}function copyFile(e,t,i){return n(this,void 0,void 0,function*(){if((yield c.lstat(e)).isSymbolicLink()){try{yield c.lstat(t);yield c.unlink(t)}catch(e){if(e.code==="EPERM"){yield c.chmod(t,"0666");yield c.unlink(t)}}const i=yield c.readlink(e);yield c.symlink(i,t,c.IS_WINDOWS?"junction":null)}else if(!(yield c.exists(t))||i){yield c.copyFile(e,t)}})}},9:function(e,t,i){"use strict";var n=this&&this.__awaiter||function(e,t,i,n){function adopt(e){return e instanceof i?e:new i(function(t){t(e)})}return new(i||(i=Promise))(function(i,s){function fulfilled(e){try{step(n.next(e))}catch(e){s(e)}}function rejected(e){try{step(n["throw"](e))}catch(e){s(e)}}function step(e){e.done?i(e.value):adopt(e.value).then(fulfilled,rejected)}step((n=n.apply(e,t||[])).next())})};Object.defineProperty(t,"__esModule",{value:true});const s=i(87);const r=i(614);const o=i(129);const c=i(622);const u=i(1);const f=i(672);const l=process.platform==="win32";class ToolRunner extends r.EventEmitter{constructor(e,t,i){super();if(!e){throw new Error("Parameter 'toolPath' cannot be null or empty.")}this.toolPath=e;this.args=t||[];this.options=i||{}}_debug(e){if(this.options.listeners&&this.options.listeners.debug){this.options.listeners.debug(e)}}_getCommandString(e,t){const i=this._getSpawnFileName();const n=this._getSpawnArgs(e);let s=t?"":"[command]";if(l){if(this._isCmdFile()){s+=i;for(const e of n){s+=` ${e}`}}else if(e.windowsVerbatimArguments){s+=`"${i}"`;for(const e of n){s+=` ${e}`}}else{s+=this._windowsQuoteCmdArg(i);for(const e of n){s+=` ${this._windowsQuoteCmdArg(e)}`}}}else{s+=i;for(const e of n){s+=` ${e}`}}return s}_processLineBuffer(e,t,i){try{let n=t+e.toString();let r=n.indexOf(s.EOL);while(r>-1){const e=n.substring(0,r);i(e);n=n.substring(r+s.EOL.length);r=n.indexOf(s.EOL)}t=n}catch(e){this._debug(`error processing line. Failed with error ${e}`)}}_getSpawnFileName(){if(l){if(this._isCmdFile()){return process.env["COMSPEC"]||"cmd.exe"}}return this.toolPath}_getSpawnArgs(e){if(l){if(this._isCmdFile()){let t=`/D /S /C "${this._windowsQuoteCmdArg(this.toolPath)}`;for(const i of this.args){t+=" ";t+=e.windowsVerbatimArguments?i:this._windowsQuoteCmdArg(i)}t+='"';return[t]}}return this.args}_endsWith(e,t){return e.endsWith(t)}_isCmdFile(){const e=this.toolPath.toUpperCase();return this._endsWith(e,".CMD")||this._endsWith(e,".BAT")}_windowsQuoteCmdArg(e){if(!this._isCmdFile()){return this._uvQuoteCmdArg(e)}if(!e){return'""'}const t=[" ","\t","&","(",")","[","]","{","}","^","=",";","!","'","+",",","`","~","|","<",">",'"'];let i=false;for(const n of e){if(t.some(e=>e===n)){i=true;break}}if(!i){return e}let n='"';let s=true;for(let t=e.length;t>0;t--){n+=e[t-1];if(s&&e[t-1]==="\\"){n+="\\"}else if(e[t-1]==='"'){s=true;n+='"'}else{s=false}}n+='"';return n.split("").reverse().join("")}_uvQuoteCmdArg(e){if(!e){return'""'}if(!e.includes(" ")&&!e.includes("\t")&&!e.includes('"')){return e}if(!e.includes('"')&&!e.includes("\\")){return`"${e}"`}let t='"';let i=true;for(let n=e.length;n>0;n--){t+=e[n-1];if(i&&e[n-1]==="\\"){t+="\\"}else if(e[n-1]==='"'){i=true;t+="\\"}else{i=false}}t+='"';return t.split("").reverse().join("")}_cloneExecOptions(e){e=e||{};const t={cwd:e.cwd||process.cwd(),env:e.env||process.env,silent:e.silent||false,windowsVerbatimArguments:e.windowsVerbatimArguments||false,failOnStdErr:e.failOnStdErr||false,ignoreReturnCode:e.ignoreReturnCode||false,delay:e.delay||1e4};t.outStream=e.outStream||process.stdout;t.errStream=e.errStream||process.stderr;return t}_getSpawnOptions(e,t){e=e||{};const i={};i.cwd=e.cwd;i.env=e.env;i["windowsVerbatimArguments"]=e.windowsVerbatimArguments||this._isCmdFile();if(e.windowsVerbatimArguments){i.argv0=`"${t}"`}return i}exec(){return n(this,void 0,void 0,function*(){if(!f.isRooted(this.toolPath)&&(this.toolPath.includes("/")||l&&this.toolPath.includes("\\"))){this.toolPath=c.resolve(process.cwd(),this.options.cwd||process.cwd(),this.toolPath)}this.toolPath=yield u.which(this.toolPath,true);return new Promise((e,t)=>{this._debug(`exec tool: ${this.toolPath}`);this._debug("arguments:");for(const e of this.args){this._debug(` ${e}`)}const i=this._cloneExecOptions(this.options);if(!i.silent&&i.outStream){i.outStream.write(this._getCommandString(i)+s.EOL)}const n=new ExecState(i,this.toolPath);n.on("debug",e=>{this._debug(e)});const r=this._getSpawnFileName();const c=o.spawn(r,this._getSpawnArgs(i),this._getSpawnOptions(this.options,r));const u="";if(c.stdout){c.stdout.on("data",e=>{if(this.options.listeners&&this.options.listeners.stdout){this.options.listeners.stdout(e)}if(!i.silent&&i.outStream){i.outStream.write(e)}this._processLineBuffer(e,u,e=>{if(this.options.listeners&&this.options.listeners.stdline){this.options.listeners.stdline(e)}})})}const f="";if(c.stderr){c.stderr.on("data",e=>{n.processStderr=true;if(this.options.listeners&&this.options.listeners.stderr){this.options.listeners.stderr(e)}if(!i.silent&&i.errStream&&i.outStream){const t=i.failOnStdErr?i.errStream:i.outStream;t.write(e)}this._processLineBuffer(e,f,e=>{if(this.options.listeners&&this.options.listeners.errline){this.options.listeners.errline(e)}})})}c.on("error",e=>{n.processError=e.message;n.processExited=true;n.processClosed=true;n.CheckComplete()});c.on("exit",e=>{n.processExitCode=e;n.processExited=true;this._debug(`Exit code ${e} received from tool '${this.toolPath}'`);n.CheckComplete()});c.on("close",e=>{n.processExitCode=e;n.processExited=true;n.processClosed=true;this._debug(`STDIO streams have closed for tool '${this.toolPath}'`);n.CheckComplete()});n.on("done",(i,n)=>{if(u.length>0){this.emit("stdline",u)}if(f.length>0){this.emit("errline",f)}c.removeAllListeners();if(i){t(i)}else{e(n)}})})})}}t.ToolRunner=ToolRunner;function argStringToArray(e){const t=[];let i=false;let n=false;let s="";function append(e){if(n&&e!=='"'){s+="\\"}s+=e;n=false}for(let r=0;r0){t.push(s);s=""}continue}append(o)}if(s.length>0){t.push(s.trim())}return t}t.argStringToArray=argStringToArray;class ExecState extends r.EventEmitter{constructor(e,t){super();this.processClosed=false;this.processError="";this.processExitCode=0;this.processExited=false;this.processStderr=false;this.delay=1e4;this.done=false;this.timeout=null;if(!t){throw new Error("toolPath must not be empty")}this.options=e;this.toolPath=t;if(e.delay){this.delay=e.delay}}CheckComplete(){if(this.done){return}if(this.processClosed){this._setResult()}else if(this.processExited){this.timeout=setTimeout(ExecState.HandleTimeout,this.delay,this)}}_debug(e){this.emit("debug",e)}_setResult(){let e;if(this.processExited){if(this.processError){e=new Error(`There was an error when attempting to execute the process '${this.toolPath}'. This may indicate the process failed to start. Error: ${this.processError}`)}else if(this.processExitCode!==0&&!this.options.ignoreReturnCode){e=new Error(`The process '${this.toolPath}' failed with exit code ${this.processExitCode}`)}else if(this.processStderr&&this.options.failOnStdErr){e=new Error(`The process '${this.toolPath}' failed because one or more lines were written to the STDERR stream`)}}if(this.timeout){clearTimeout(this.timeout);this.timeout=null}this.done=true;this.emit("done",e,this.processExitCode)}static HandleTimeout(e){if(e.done){return}if(!e.processClosed&&e.processExited){const t=`The STDIO streams did not close within ${e.delay/1e3} seconds of the exit event from process '${e.toolPath}'. This may indicate a child process inherited the STDIO streams and has not yet exited.`;e._debug(t)}e._setResult()}}},82:function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:true});function toCommandValue(e){if(e===null||e===undefined){return""}else if(typeof e==="string"||e instanceof String){return e}return JSON.stringify(e)}t.toCommandValue=toCommandValue},87:function(e){e.exports=require("os")},102:function(e,t,i){"use strict";var n=this&&this.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(e!=null)for(var i in e)if(Object.hasOwnProperty.call(e,i))t[i]=e[i];t["default"]=e;return t};Object.defineProperty(t,"__esModule",{value:true});const s=n(i(747));const r=n(i(87));const o=i(82);function issueCommand(e,t){const i=process.env[`GITHUB_${e}`];if(!i){throw new Error(`Unable to find environment variable for file command ${e}`)}if(!s.existsSync(i)){throw new Error(`Missing file at path: ${i}`)}s.appendFileSync(i,`${o.toCommandValue(t)}${r.EOL}`,{encoding:"utf8"})}t.issueCommand=issueCommand},104:function(e,t,i){const n=i(765);const s=i(470);const r=i(986);const o=s.getInput("check_fmt")||false;async function main(){try{if(o){await r.exec("rustup",["component","add","rustfmt"]);await r.exec("cargo",["fmt","--","--check"])}await r.exec("cargo",["build","--workspace"]);await r.exec("cargo",["test","--workspace"])}catch(e){console.log(e);n.exit(1)}}main()},129:function(e){e.exports=require("child_process")},357:function(e){e.exports=require("assert")},431:function(e,t,i){"use strict";var n=this&&this.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(e!=null)for(var i in e)if(Object.hasOwnProperty.call(e,i))t[i]=e[i];t["default"]=e;return t};Object.defineProperty(t,"__esModule",{value:true});const s=n(i(87));const r=i(82);function issueCommand(e,t,i){const n=new Command(e,t,i);process.stdout.write(n.toString()+s.EOL)}t.issueCommand=issueCommand;function issue(e,t=""){issueCommand(e,{},t)}t.issue=issue;const o="::";class Command{constructor(e,t,i){if(!e){e="missing.command"}this.command=e;this.properties=t;this.message=i}toString(){let e=o+this.command;if(this.properties&&Object.keys(this.properties).length>0){e+=" ";let t=true;for(const i in this.properties){if(this.properties.hasOwnProperty(i)){const n=this.properties[i];if(n){if(t){t=false}else{e+=","}e+=`${i}=${escapeProperty(n)}`}}}}e+=`${o}${escapeData(this.message)}`;return e}}function escapeData(e){return r.toCommandValue(e).replace(/%/g,"%25").replace(/\r/g,"%0D").replace(/\n/g,"%0A")}function escapeProperty(e){return r.toCommandValue(e).replace(/%/g,"%25").replace(/\r/g,"%0D").replace(/\n/g,"%0A").replace(/:/g,"%3A").replace(/,/g,"%2C")}},470:function(e,t,i){"use strict";var n=this&&this.__awaiter||function(e,t,i,n){function adopt(e){return e instanceof i?e:new i(function(t){t(e)})}return new(i||(i=Promise))(function(i,s){function fulfilled(e){try{step(n.next(e))}catch(e){s(e)}}function rejected(e){try{step(n["throw"](e))}catch(e){s(e)}}function step(e){e.done?i(e.value):adopt(e.value).then(fulfilled,rejected)}step((n=n.apply(e,t||[])).next())})};var s=this&&this.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(e!=null)for(var i in e)if(Object.hasOwnProperty.call(e,i))t[i]=e[i];t["default"]=e;return t};Object.defineProperty(t,"__esModule",{value:true});const r=i(431);const o=i(102);const c=i(82);const u=s(i(87));const f=s(i(622));var l;(function(e){e[e["Success"]=0]="Success";e[e["Failure"]=1]="Failure"})(l=t.ExitCode||(t.ExitCode={}));function exportVariable(e,t){const i=c.toCommandValue(t);process.env[e]=i;const n=process.env["GITHUB_ENV"]||"";if(n){const t="_GitHubActionsFileCommandDelimeter_";const n=`${e}<<${t}${u.EOL}${i}${u.EOL}${t}`;o.issueCommand("ENV",n)}else{r.issueCommand("set-env",{name:e},i)}}t.exportVariable=exportVariable;function setSecret(e){r.issueCommand("add-mask",{},e)}t.setSecret=setSecret;function addPath(e){const t=process.env["GITHUB_PATH"]||"";if(t){o.issueCommand("PATH",e)}else{r.issueCommand("add-path",{},e)}process.env["PATH"]=`${e}${f.delimiter}${process.env["PATH"]}`}t.addPath=addPath;function getInput(e,t){const i=process.env[`INPUT_${e.replace(/ /g,"_").toUpperCase()}`]||"";if(t&&t.required&&!i){throw new Error(`Input required and not supplied: ${e}`)}return i.trim()}t.getInput=getInput;function setOutput(e,t){r.issueCommand("set-output",{name:e},t)}t.setOutput=setOutput;function setCommandEcho(e){r.issue("echo",e?"on":"off")}t.setCommandEcho=setCommandEcho;function setFailed(e){process.exitCode=l.Failure;error(e)}t.setFailed=setFailed;function isDebug(){return process.env["RUNNER_DEBUG"]==="1"}t.isDebug=isDebug;function debug(e){r.issueCommand("debug",{},e)}t.debug=debug;function error(e){r.issue("error",e instanceof Error?e.toString():e)}t.error=error;function warning(e){r.issue("warning",e instanceof Error?e.toString():e)}t.warning=warning;function info(e){process.stdout.write(e+u.EOL)}t.info=info;function startGroup(e){r.issue("group",e)}t.startGroup=startGroup;function endGroup(){r.issue("endgroup")}t.endGroup=endGroup;function group(e,t){return n(this,void 0,void 0,function*(){startGroup(e);let i;try{i=yield t()}finally{endGroup()}return i})}t.group=group;function saveState(e,t){r.issueCommand("save-state",{name:e},t)}t.saveState=saveState;function getState(e){return process.env[`STATE_${e}`]||""}t.getState=getState},614:function(e){e.exports=require("events")},622:function(e){e.exports=require("path")},669:function(e){e.exports=require("util")},672:function(e,t,i){"use strict";var n=this&&this.__awaiter||function(e,t,i,n){function adopt(e){return e instanceof i?e:new i(function(t){t(e)})}return new(i||(i=Promise))(function(i,s){function fulfilled(e){try{step(n.next(e))}catch(e){s(e)}}function rejected(e){try{step(n["throw"](e))}catch(e){s(e)}}function step(e){e.done?i(e.value):adopt(e.value).then(fulfilled,rejected)}step((n=n.apply(e,t||[])).next())})};var s;Object.defineProperty(t,"__esModule",{value:true});const r=i(357);const o=i(747);const c=i(622);s=o.promises,t.chmod=s.chmod,t.copyFile=s.copyFile,t.lstat=s.lstat,t.mkdir=s.mkdir,t.readdir=s.readdir,t.readlink=s.readlink,t.rename=s.rename,t.rmdir=s.rmdir,t.stat=s.stat,t.symlink=s.symlink,t.unlink=s.unlink;t.IS_WINDOWS=process.platform==="win32";function exists(e){return n(this,void 0,void 0,function*(){try{yield t.stat(e)}catch(e){if(e.code==="ENOENT"){return false}throw e}return true})}t.exists=exists;function isDirectory(e,i=false){return n(this,void 0,void 0,function*(){const n=i?yield t.stat(e):yield t.lstat(e);return n.isDirectory()})}t.isDirectory=isDirectory;function isRooted(e){e=normalizeSeparators(e);if(!e){throw new Error('isRooted() parameter "p" cannot be empty')}if(t.IS_WINDOWS){return e.startsWith("\\")||/^[A-Z]:/i.test(e)}return e.startsWith("/")}t.isRooted=isRooted;function mkdirP(e,i=1e3,s=1){return n(this,void 0,void 0,function*(){r.ok(e,"a path argument must be provided");e=c.resolve(e);if(s>=i)return t.mkdir(e);try{yield t.mkdir(e);return}catch(n){switch(n.code){case"ENOENT":{yield mkdirP(c.dirname(e),i,s+1);yield t.mkdir(e);return}default:{let i;try{i=yield t.stat(e)}catch(e){throw n}if(!i.isDirectory())throw n}}}})}t.mkdirP=mkdirP;function tryGetExecutablePath(e,i){return n(this,void 0,void 0,function*(){let n=undefined;try{n=yield t.stat(e)}catch(t){if(t.code!=="ENOENT"){console.log(`Unexpected error attempting to determine if executable file exists '${e}': ${t}`)}}if(n&&n.isFile()){if(t.IS_WINDOWS){const t=c.extname(e).toUpperCase();if(i.some(e=>e.toUpperCase()===t)){return e}}else{if(isUnixExecutable(n)){return e}}}const s=e;for(const r of i){e=s+r;n=undefined;try{n=yield t.stat(e)}catch(t){if(t.code!=="ENOENT"){console.log(`Unexpected error attempting to determine if executable file exists '${e}': ${t}`)}}if(n&&n.isFile()){if(t.IS_WINDOWS){try{const i=c.dirname(e);const n=c.basename(e).toUpperCase();for(const s of yield t.readdir(i)){if(n===s.toUpperCase()){e=c.join(i,s);break}}}catch(t){console.log(`Unexpected error attempting to determine the actual case of the file '${e}': ${t}`)}return e}else{if(isUnixExecutable(n)){return e}}}}return""})}t.tryGetExecutablePath=tryGetExecutablePath;function normalizeSeparators(e){e=e||"";if(t.IS_WINDOWS){e=e.replace(/\//g,"\\");return e.replace(/\\\\+/g,"\\")}return e.replace(/\/\/+/g,"/")}function isUnixExecutable(e){return(e.mode&1)>0||(e.mode&8)>0&&e.gid===process.getgid()||(e.mode&64)>0&&e.uid===process.getuid()}},747:function(e){e.exports=require("fs")},765:function(e){e.exports=require("process")},986:function(e,t,i){"use strict";var n=this&&this.__awaiter||function(e,t,i,n){function adopt(e){return e instanceof i?e:new i(function(t){t(e)})}return new(i||(i=Promise))(function(i,s){function fulfilled(e){try{step(n.next(e))}catch(e){s(e)}}function rejected(e){try{step(n["throw"](e))}catch(e){s(e)}}function step(e){e.done?i(e.value):adopt(e.value).then(fulfilled,rejected)}step((n=n.apply(e,t||[])).next())})};Object.defineProperty(t,"__esModule",{value:true});const s=i(9);function exec(e,t,i){return n(this,void 0,void 0,function*(){const n=s.argStringToArray(e);if(n.length===0){throw new Error(`Parameter 'commandLine' cannot be null or empty.`)}const r=n[0];t=n.slice(1).concat(t||[]);const o=new s.ToolRunner(r,t,i);return o.exec()})}t.exec=exec}}); \ No newline at end of file diff --git a/github-actions/simple-ci/index.js b/github-actions/simple-ci/index.js deleted file mode 100644 index 5cdc60107..000000000 --- a/github-actions/simple-ci/index.js +++ /dev/null @@ -1,25 +0,0 @@ -const process = require('process') - -// Third Party libraries -const actions = require('@actions/core') -const exec = require('@actions/exec') - -// Configuration -const checkFmt = actions.getInput('check_fmt') || false - -async function main () { - try { - if (checkFmt) { - await exec.exec('rustup', ['component', 'add', 'rustfmt']) - await exec.exec('cargo', ['fmt', '--', '--check']) - } - - await exec.exec('cargo', ['build', '--workspace']) - await exec.exec('cargo', ['test', '--workspace']) - } catch (error) { - console.log(error) - process.exit(1) - } -} - -main() diff --git a/github-actions/simple-ci/package-lock.json b/github-actions/simple-ci/package-lock.json deleted file mode 100644 index 7f6c52dec..000000000 --- a/github-actions/simple-ci/package-lock.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "simple-ci", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@actions/core": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz", - "integrity": "sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA==" - }, - "@actions/exec": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.0.3.tgz", - "integrity": "sha512-TogJGnueOmM7ntCi0ASTUj4LapRRtDfj57Ja4IhPmg2fls28uVOPbAn8N+JifaOumN2UG3oEO/Ixek2A4NcYSA==", - "requires": { - "@actions/io": "^1.0.1" - } - }, - "@actions/io": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.0.2.tgz", - "integrity": "sha512-J8KuFqVPr3p6U8W93DOXlXW6zFvrQAJANdS+vw0YhusLIq+bszW8zmK2Fh1C2kDPX8FMvwIl1OUcFgvJoXLbAg==" - }, - "@zeit/ncc": { - "version": "0.20.5", - "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.20.5.tgz", - "integrity": "sha512-XU6uzwvv95DqxciQx+aOLhbyBx/13ky+RK1y88Age9Du3BlA4mMPCy13BGjayOrrumOzlq1XV3SD/BWiZENXlw==", - "dev": true - } - } -} diff --git a/github-actions/simple-ci/package.json b/github-actions/simple-ci/package.json deleted file mode 100644 index 26018dea3..000000000 --- a/github-actions/simple-ci/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "simple-ci", - "version": "1.0.0", - "description": "Easily build and test Rust projects", - "main": "index.js", - "scripts": { - "start": "node index.js", - "build": "node_modules/.bin/ncc build --minify index.js" - }, - "author": "", - "license": "MIT", - "dependencies": { - "@actions/core": "^1.2.6", - "@actions/exec": "^1.0.1" - }, - "devDependencies": { - "@zeit/ncc": "^0.20.5" - } -} From b869f69734ad7f37cfe11b10aee5e812e7b18e9b Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 30 Jul 2024 17:12:23 +0200 Subject: [PATCH 100/217] chore: update aws provider in wiz module --- .../bors-prod/wiz/.terraform.lock.hcl | 33 +++++++++--------- .../bors-staging/wiz/.terraform.lock.hcl | 33 +++++++++--------- .../crates-io-prod/wiz/.terraform.lock.hcl | 34 +++++++++---------- .../crates-io-staging/wiz/.terraform.lock.hcl | 34 +++++++++---------- .../dev-desktops-prod/wiz/.terraform.lock.hcl | 33 +++++++++--------- .../docs-rs-staging/wiz/.terraform.lock.hcl | 33 +++++++++--------- .../accounts/legacy/wiz/.terraform.lock.hcl | 33 +++++++++--------- .../accounts/root/wiz/.terraform.lock.hcl | 33 +++++++++--------- .../sync-team-prod/wiz/.terraform.lock.hcl | 33 +++++++++--------- terragrunt/modules/wiz/_terraform.tf | 3 +- 10 files changed, 154 insertions(+), 148 deletions(-) diff --git a/terragrunt/accounts/bors-prod/wiz/.terraform.lock.hcl b/terragrunt/accounts/bors-prod/wiz/.terraform.lock.hcl index 7b6450fc6..bcb68997b 100644 --- a/terragrunt/accounts/bors-prod/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-prod/wiz/.terraform.lock.hcl @@ -2,23 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.4.0" + version = "5.60.0" + constraints = "~> 5.60" hashes = [ - "h1:4eGsUS3r5eApQc19t8woc6d+sQLaOBaCSaK5GyGcWf0=", - "zh:1db5f81089216831bb0fdff9ddc3772efa133397c66ec276bc75b96eec06e23f", - "zh:26fe5fdf399192b5724d21854fbec650c158f8ee9eb1dc52a50f7da0f2bc07ac", - "zh:2946d9e333b1efe01588ee9f9771169fd3c3a4a7cb78ed8f91e8b3efd1a73850", - "zh:36ed69e8d3029332c8a52a70940f714fd579b9fd95f5569cc010ef11162f5bf7", - "zh:46ba5ad1c3a3ef98c346356cfa4bdd9c2501c661c2513bb92f4413f2482fb24b", - "zh:46c10aaa9672b54a14b0e0effdd6ecd9b8a539b3bfe273ac54111e7352a7bb4b", - "zh:47d7f57bcbe4fba2f960ab6c4228c5e9e586be2f233a8baa8962b51a63337179", - "zh:47e41c198439ba1c4d933f808b6f47e518f8f0aae25ca42abcac97f149121e90", - "zh:526c5834de71654ee14039cb973322bf5032cb684a2a113b48fb48a0584f46f3", - "zh:6169316517b95677819ba2904dcea204fb9b55e868348e906af9164104fe7198", - "zh:7c063ef2b8d69a8db7e8bf0dcd45793ede22b259b30464ed114d330df304cdbb", - "zh:87c4f2faca636715a08be3121d26b3354415401eab89349077ca9436a0822c23", + "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", + "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", + "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", + "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", + "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", + "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", + "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", + "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", + "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b184b8a268f45258edd27d389ca793708f1bc3ee4d6706d154a45e93deaddde1", - "zh:ba1a998cbf4b639fa3e04b9069f0f5a289662457940726a8a51c81df400aa852", + "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", + "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", + "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", + "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", + "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", + "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", ] } diff --git a/terragrunt/accounts/bors-staging/wiz/.terraform.lock.hcl b/terragrunt/accounts/bors-staging/wiz/.terraform.lock.hcl index 7b6450fc6..bcb68997b 100644 --- a/terragrunt/accounts/bors-staging/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-staging/wiz/.terraform.lock.hcl @@ -2,23 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.4.0" + version = "5.60.0" + constraints = "~> 5.60" hashes = [ - "h1:4eGsUS3r5eApQc19t8woc6d+sQLaOBaCSaK5GyGcWf0=", - "zh:1db5f81089216831bb0fdff9ddc3772efa133397c66ec276bc75b96eec06e23f", - "zh:26fe5fdf399192b5724d21854fbec650c158f8ee9eb1dc52a50f7da0f2bc07ac", - "zh:2946d9e333b1efe01588ee9f9771169fd3c3a4a7cb78ed8f91e8b3efd1a73850", - "zh:36ed69e8d3029332c8a52a70940f714fd579b9fd95f5569cc010ef11162f5bf7", - "zh:46ba5ad1c3a3ef98c346356cfa4bdd9c2501c661c2513bb92f4413f2482fb24b", - "zh:46c10aaa9672b54a14b0e0effdd6ecd9b8a539b3bfe273ac54111e7352a7bb4b", - "zh:47d7f57bcbe4fba2f960ab6c4228c5e9e586be2f233a8baa8962b51a63337179", - "zh:47e41c198439ba1c4d933f808b6f47e518f8f0aae25ca42abcac97f149121e90", - "zh:526c5834de71654ee14039cb973322bf5032cb684a2a113b48fb48a0584f46f3", - "zh:6169316517b95677819ba2904dcea204fb9b55e868348e906af9164104fe7198", - "zh:7c063ef2b8d69a8db7e8bf0dcd45793ede22b259b30464ed114d330df304cdbb", - "zh:87c4f2faca636715a08be3121d26b3354415401eab89349077ca9436a0822c23", + "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", + "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", + "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", + "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", + "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", + "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", + "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", + "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", + "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b184b8a268f45258edd27d389ca793708f1bc3ee4d6706d154a45e93deaddde1", - "zh:ba1a998cbf4b639fa3e04b9069f0f5a289662457940726a8a51c81df400aa852", + "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", + "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", + "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", + "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", + "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", + "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", ] } diff --git a/terragrunt/accounts/crates-io-prod/wiz/.terraform.lock.hcl b/terragrunt/accounts/crates-io-prod/wiz/.terraform.lock.hcl index 777f97bd4..bcb68997b 100644 --- a/terragrunt/accounts/crates-io-prod/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/crates-io-prod/wiz/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20" + version = "5.60.0" + constraints = "~> 5.60" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", + "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", + "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", + "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", + "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", + "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", + "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", + "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", + "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", + "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", + "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", + "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", + "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", + "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", ] } diff --git a/terragrunt/accounts/crates-io-staging/wiz/.terraform.lock.hcl b/terragrunt/accounts/crates-io-staging/wiz/.terraform.lock.hcl index 777f97bd4..bcb68997b 100644 --- a/terragrunt/accounts/crates-io-staging/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/crates-io-staging/wiz/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20" + version = "5.60.0" + constraints = "~> 5.60" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", + "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", + "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", + "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", + "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", + "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", + "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", + "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", + "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", + "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", + "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", + "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", + "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", + "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", ] } diff --git a/terragrunt/accounts/dev-desktops-prod/wiz/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/wiz/.terraform.lock.hcl index 7b6450fc6..bcb68997b 100644 --- a/terragrunt/accounts/dev-desktops-prod/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/wiz/.terraform.lock.hcl @@ -2,23 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.4.0" + version = "5.60.0" + constraints = "~> 5.60" hashes = [ - "h1:4eGsUS3r5eApQc19t8woc6d+sQLaOBaCSaK5GyGcWf0=", - "zh:1db5f81089216831bb0fdff9ddc3772efa133397c66ec276bc75b96eec06e23f", - "zh:26fe5fdf399192b5724d21854fbec650c158f8ee9eb1dc52a50f7da0f2bc07ac", - "zh:2946d9e333b1efe01588ee9f9771169fd3c3a4a7cb78ed8f91e8b3efd1a73850", - "zh:36ed69e8d3029332c8a52a70940f714fd579b9fd95f5569cc010ef11162f5bf7", - "zh:46ba5ad1c3a3ef98c346356cfa4bdd9c2501c661c2513bb92f4413f2482fb24b", - "zh:46c10aaa9672b54a14b0e0effdd6ecd9b8a539b3bfe273ac54111e7352a7bb4b", - "zh:47d7f57bcbe4fba2f960ab6c4228c5e9e586be2f233a8baa8962b51a63337179", - "zh:47e41c198439ba1c4d933f808b6f47e518f8f0aae25ca42abcac97f149121e90", - "zh:526c5834de71654ee14039cb973322bf5032cb684a2a113b48fb48a0584f46f3", - "zh:6169316517b95677819ba2904dcea204fb9b55e868348e906af9164104fe7198", - "zh:7c063ef2b8d69a8db7e8bf0dcd45793ede22b259b30464ed114d330df304cdbb", - "zh:87c4f2faca636715a08be3121d26b3354415401eab89349077ca9436a0822c23", + "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", + "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", + "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", + "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", + "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", + "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", + "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", + "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", + "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b184b8a268f45258edd27d389ca793708f1bc3ee4d6706d154a45e93deaddde1", - "zh:ba1a998cbf4b639fa3e04b9069f0f5a289662457940726a8a51c81df400aa852", + "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", + "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", + "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", + "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", + "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", + "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", ] } diff --git a/terragrunt/accounts/docs-rs-staging/wiz/.terraform.lock.hcl b/terragrunt/accounts/docs-rs-staging/wiz/.terraform.lock.hcl index 7b6450fc6..bcb68997b 100644 --- a/terragrunt/accounts/docs-rs-staging/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/docs-rs-staging/wiz/.terraform.lock.hcl @@ -2,23 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.4.0" + version = "5.60.0" + constraints = "~> 5.60" hashes = [ - "h1:4eGsUS3r5eApQc19t8woc6d+sQLaOBaCSaK5GyGcWf0=", - "zh:1db5f81089216831bb0fdff9ddc3772efa133397c66ec276bc75b96eec06e23f", - "zh:26fe5fdf399192b5724d21854fbec650c158f8ee9eb1dc52a50f7da0f2bc07ac", - "zh:2946d9e333b1efe01588ee9f9771169fd3c3a4a7cb78ed8f91e8b3efd1a73850", - "zh:36ed69e8d3029332c8a52a70940f714fd579b9fd95f5569cc010ef11162f5bf7", - "zh:46ba5ad1c3a3ef98c346356cfa4bdd9c2501c661c2513bb92f4413f2482fb24b", - "zh:46c10aaa9672b54a14b0e0effdd6ecd9b8a539b3bfe273ac54111e7352a7bb4b", - "zh:47d7f57bcbe4fba2f960ab6c4228c5e9e586be2f233a8baa8962b51a63337179", - "zh:47e41c198439ba1c4d933f808b6f47e518f8f0aae25ca42abcac97f149121e90", - "zh:526c5834de71654ee14039cb973322bf5032cb684a2a113b48fb48a0584f46f3", - "zh:6169316517b95677819ba2904dcea204fb9b55e868348e906af9164104fe7198", - "zh:7c063ef2b8d69a8db7e8bf0dcd45793ede22b259b30464ed114d330df304cdbb", - "zh:87c4f2faca636715a08be3121d26b3354415401eab89349077ca9436a0822c23", + "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", + "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", + "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", + "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", + "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", + "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", + "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", + "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", + "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b184b8a268f45258edd27d389ca793708f1bc3ee4d6706d154a45e93deaddde1", - "zh:ba1a998cbf4b639fa3e04b9069f0f5a289662457940726a8a51c81df400aa852", + "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", + "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", + "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", + "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", + "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", + "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", ] } diff --git a/terragrunt/accounts/legacy/wiz/.terraform.lock.hcl b/terragrunt/accounts/legacy/wiz/.terraform.lock.hcl index 7b6450fc6..bcb68997b 100644 --- a/terragrunt/accounts/legacy/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/wiz/.terraform.lock.hcl @@ -2,23 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.4.0" + version = "5.60.0" + constraints = "~> 5.60" hashes = [ - "h1:4eGsUS3r5eApQc19t8woc6d+sQLaOBaCSaK5GyGcWf0=", - "zh:1db5f81089216831bb0fdff9ddc3772efa133397c66ec276bc75b96eec06e23f", - "zh:26fe5fdf399192b5724d21854fbec650c158f8ee9eb1dc52a50f7da0f2bc07ac", - "zh:2946d9e333b1efe01588ee9f9771169fd3c3a4a7cb78ed8f91e8b3efd1a73850", - "zh:36ed69e8d3029332c8a52a70940f714fd579b9fd95f5569cc010ef11162f5bf7", - "zh:46ba5ad1c3a3ef98c346356cfa4bdd9c2501c661c2513bb92f4413f2482fb24b", - "zh:46c10aaa9672b54a14b0e0effdd6ecd9b8a539b3bfe273ac54111e7352a7bb4b", - "zh:47d7f57bcbe4fba2f960ab6c4228c5e9e586be2f233a8baa8962b51a63337179", - "zh:47e41c198439ba1c4d933f808b6f47e518f8f0aae25ca42abcac97f149121e90", - "zh:526c5834de71654ee14039cb973322bf5032cb684a2a113b48fb48a0584f46f3", - "zh:6169316517b95677819ba2904dcea204fb9b55e868348e906af9164104fe7198", - "zh:7c063ef2b8d69a8db7e8bf0dcd45793ede22b259b30464ed114d330df304cdbb", - "zh:87c4f2faca636715a08be3121d26b3354415401eab89349077ca9436a0822c23", + "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", + "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", + "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", + "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", + "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", + "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", + "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", + "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", + "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b184b8a268f45258edd27d389ca793708f1bc3ee4d6706d154a45e93deaddde1", - "zh:ba1a998cbf4b639fa3e04b9069f0f5a289662457940726a8a51c81df400aa852", + "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", + "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", + "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", + "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", + "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", + "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", ] } diff --git a/terragrunt/accounts/root/wiz/.terraform.lock.hcl b/terragrunt/accounts/root/wiz/.terraform.lock.hcl index 7b6450fc6..bcb68997b 100644 --- a/terragrunt/accounts/root/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/root/wiz/.terraform.lock.hcl @@ -2,23 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.4.0" + version = "5.60.0" + constraints = "~> 5.60" hashes = [ - "h1:4eGsUS3r5eApQc19t8woc6d+sQLaOBaCSaK5GyGcWf0=", - "zh:1db5f81089216831bb0fdff9ddc3772efa133397c66ec276bc75b96eec06e23f", - "zh:26fe5fdf399192b5724d21854fbec650c158f8ee9eb1dc52a50f7da0f2bc07ac", - "zh:2946d9e333b1efe01588ee9f9771169fd3c3a4a7cb78ed8f91e8b3efd1a73850", - "zh:36ed69e8d3029332c8a52a70940f714fd579b9fd95f5569cc010ef11162f5bf7", - "zh:46ba5ad1c3a3ef98c346356cfa4bdd9c2501c661c2513bb92f4413f2482fb24b", - "zh:46c10aaa9672b54a14b0e0effdd6ecd9b8a539b3bfe273ac54111e7352a7bb4b", - "zh:47d7f57bcbe4fba2f960ab6c4228c5e9e586be2f233a8baa8962b51a63337179", - "zh:47e41c198439ba1c4d933f808b6f47e518f8f0aae25ca42abcac97f149121e90", - "zh:526c5834de71654ee14039cb973322bf5032cb684a2a113b48fb48a0584f46f3", - "zh:6169316517b95677819ba2904dcea204fb9b55e868348e906af9164104fe7198", - "zh:7c063ef2b8d69a8db7e8bf0dcd45793ede22b259b30464ed114d330df304cdbb", - "zh:87c4f2faca636715a08be3121d26b3354415401eab89349077ca9436a0822c23", + "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", + "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", + "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", + "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", + "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", + "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", + "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", + "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", + "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b184b8a268f45258edd27d389ca793708f1bc3ee4d6706d154a45e93deaddde1", - "zh:ba1a998cbf4b639fa3e04b9069f0f5a289662457940726a8a51c81df400aa852", + "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", + "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", + "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", + "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", + "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", + "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", ] } diff --git a/terragrunt/accounts/sync-team-prod/wiz/.terraform.lock.hcl b/terragrunt/accounts/sync-team-prod/wiz/.terraform.lock.hcl index 7b6450fc6..bcb68997b 100644 --- a/terragrunt/accounts/sync-team-prod/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/sync-team-prod/wiz/.terraform.lock.hcl @@ -2,23 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.4.0" + version = "5.60.0" + constraints = "~> 5.60" hashes = [ - "h1:4eGsUS3r5eApQc19t8woc6d+sQLaOBaCSaK5GyGcWf0=", - "zh:1db5f81089216831bb0fdff9ddc3772efa133397c66ec276bc75b96eec06e23f", - "zh:26fe5fdf399192b5724d21854fbec650c158f8ee9eb1dc52a50f7da0f2bc07ac", - "zh:2946d9e333b1efe01588ee9f9771169fd3c3a4a7cb78ed8f91e8b3efd1a73850", - "zh:36ed69e8d3029332c8a52a70940f714fd579b9fd95f5569cc010ef11162f5bf7", - "zh:46ba5ad1c3a3ef98c346356cfa4bdd9c2501c661c2513bb92f4413f2482fb24b", - "zh:46c10aaa9672b54a14b0e0effdd6ecd9b8a539b3bfe273ac54111e7352a7bb4b", - "zh:47d7f57bcbe4fba2f960ab6c4228c5e9e586be2f233a8baa8962b51a63337179", - "zh:47e41c198439ba1c4d933f808b6f47e518f8f0aae25ca42abcac97f149121e90", - "zh:526c5834de71654ee14039cb973322bf5032cb684a2a113b48fb48a0584f46f3", - "zh:6169316517b95677819ba2904dcea204fb9b55e868348e906af9164104fe7198", - "zh:7c063ef2b8d69a8db7e8bf0dcd45793ede22b259b30464ed114d330df304cdbb", - "zh:87c4f2faca636715a08be3121d26b3354415401eab89349077ca9436a0822c23", + "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", + "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", + "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", + "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", + "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", + "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", + "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", + "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", + "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b184b8a268f45258edd27d389ca793708f1bc3ee4d6706d154a45e93deaddde1", - "zh:ba1a998cbf4b639fa3e04b9069f0f5a289662457940726a8a51c81df400aa852", + "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", + "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", + "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", + "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", + "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", + "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", ] } diff --git a/terragrunt/modules/wiz/_terraform.tf b/terragrunt/modules/wiz/_terraform.tf index 6e71aed42..112d81ff3 100644 --- a/terragrunt/modules/wiz/_terraform.tf +++ b/terragrunt/modules/wiz/_terraform.tf @@ -4,8 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.60" } } } - From 6d549c87367fba4040e5e8cfb43b64a9c37f51e0 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 31 Jul 2024 14:02:25 +0200 Subject: [PATCH 101/217] docs: add aws cli tip --- terragrunt/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/terragrunt/README.md b/terragrunt/README.md index 1df8c6eff..9343b8d61 100644 --- a/terragrunt/README.md +++ b/terragrunt/README.md @@ -157,5 +157,14 @@ You can then `cd` into the corresponding service within the `accounts` directory and run `terragrunt plan` to see the plan terraform will apply and `terragrunt apply` to actually apply the plan. +## AWS CLI + +If you get a 403 when you run commands with the AWS CLI, +append the `--profile ` flag to the command. For example: + +```sh +aws s3 cp s3://staging-crates-io-downloads-archive/2023-11-11.csv . --profile crates-io-staging +``` + [terraform]: https://www.terraform.io/ [terragrunt]: https://terragrunt.gruntwork.io/ From 4a1cf7f692c31a2986718e81aacac7e702a8ba12 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 31 Jul 2024 15:51:34 +0200 Subject: [PATCH 102/217] chore(resource-group): update providers --- .../resource-group/.terraform.lock.hcl | 60 +++++++++---------- .../modules/resource-group/_terraform.tf | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl index e822a7f1c..c1ebce63b 100644 --- a/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl @@ -2,43 +2,43 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.49.0" + version = "5.60.0" hashes = [ - "h1:RZtXnBRpO4LNmmz0tXJQLa2heqk9VFGblFZtRCZkm/M=", - "zh:0979b07cdeffb868ea605e4bbc008adc7cccb5f3ba1d3a0b794ea3e8fff20932", - "zh:2121a0a048a1d9419df69f3561e524b7e8a6b74ba0f57bd8948799f12b6ad3a1", - "zh:573362042ba0bd18e98567a4f45d91b09eb0d223513518ba04f16a646a906403", - "zh:57be7a4d6c362be2fa586d270203f4eac1ee239816239a9503b86ebc8fa1fef0", - "zh:5c72ed211d9234edd70eac9d77c3cafc7bbf819d1c28332a6d77acf227c9a23c", - "zh:7786d1a9781f8e8c0079bf58f4ed4aeddec0caf54ad7ddcf43c47936d545a04f", - "zh:82133e7d39787ee91ed41988da71beecc2ecb900b5da94b3f3d77fbc4d4dc722", - "zh:8cdb1c154dead85be8352afd30eaf41c59249de9e7e0a8eb4ab8e625b90a4922", + "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", + "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", + "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", + "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", + "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", + "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", + "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", + "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", + "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:ac215fd1c3bd647ae38868940651b97a53197688daefcd70b3595c84560e5267", - "zh:c45db22356d20e431639061a72e07da5201f4937c1df6b9f03f32019facf3905", - "zh:c9ba90e62db9a4708ed1a4e094849f88ce9d44c52b49f613b30bb3f7523b8d97", - "zh:d2be3607be2209995c80dc1d66086d527de5d470f73509e813254067e8287106", - "zh:e3fa20090f3cebf3911fc7ef122bd8c0505e3330ab7d541fa945fea861205007", - "zh:ef1b9d5c0b6279323f2ecfc322db8083e141984cfe1bb2f33c0f4934fccb69e3", + "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", + "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", + "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", + "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", + "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", + "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.31.0" - constraints = "3.31.0" + version = "3.113.0" + constraints = "3.113.0" hashes = [ - "h1:zc5rG3g3DUeQQEYpCfqm0tCAlfqxeXc74iQ95EgDv/0=", - "zh:1b61b26373bbb06e811e4ccb762651354d776db574ec904ac32835c98322ab98", - "zh:2ccea8876e54127e16729c09e9c59d164abc2a600230d3fc8331c459f91187af", - "zh:300f35a16f08a19eed08708561ecca044bc570d91e7f863f2b203c78e9df3a5f", - "zh:4e77936cbf555ea068a63095072ad7b636b598da02629375925f8ac539313f96", - "zh:63486a678e9e536a3a996dd2698b7d39d3b65d83a79e14b5520d5e26bde76d47", - "zh:8c620e70cae53b7c9ed923596d441fa5f09ff50bd1379b936e4a88211de86951", - "zh:91cc1b9bc3dfcadfe40750872baf254a8b1f715e2784e3f323edcfebfe5a4012", - "zh:b0b4c3064a58f831ad7ee36baee9bb18fc24cab8ca76902fec8bbc95aefffadf", - "zh:b70ea503c093d6d4fbbcd064c93a2139c8424a6ade6a7d9d869cd7c367f0b050", - "zh:d9738184fccca96bec3ded26c2e10c104423330be25a473d4e5e383b2161cdfe", + "h1:SbNQLapCxbTbhM37LaRALPizAZMiA5sTRC09sUWgZOo=", + "zh:12479f5664288943400447b55e50df675c28ae82ad8d373cc2e5682f3a3411f0", + "zh:1b42a14e80e568429d3b55fed753ca3ef0df9dcdfa107890d7264599c020940f", + "zh:381be6ca617f848de3baa3985a6e1788e91a803afe04a3c5c727453528b6310d", + "zh:3e70e2e07b6db1c363de3e5d0ca47f27fc956473df03329c7d2e54d3ac29176b", + "zh:87c7633aeaa828098c6055da9e67d4acaf4b46748b6b3f0267e105e55f05de25", + "zh:8d0d98226901f874770dd5220d4701a12ae8bd586994615aa7dcba12b9736bec", + "zh:9fd913acd42a60c3a90a18ce803567ef861db8779a59aacced91f2cbd86de9d9", + "zh:b6f3f7ae0a055437fb36c139af9bb3135e7f4dad172157ae1eb0177dc74d703f", + "zh:b927027ba2bf40d34e03d742fd2b6c5299023b5ab8e6f05e50aac76a46ad1094", + "zh:ceb5187b9d2a439f4e48944f3ffeeeaf47a03dbe6f3325ea1775bf659ce0aa88", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fcf1630b47bfae8e9834390b1a5cf4f6fd9ff0cc1ca596e6b60e9327db7529f4", + "zh:fb9d78dfeca7489bffca9b1a1f3abee7f16dbbcba31388aea1102062c1d6dce8", ] } diff --git a/terragrunt/modules/resource-group/_terraform.tf b/terragrunt/modules/resource-group/_terraform.tf index 5cde41cf8..32f8fc632 100644 --- a/terragrunt/modules/resource-group/_terraform.tf +++ b/terragrunt/modules/resource-group/_terraform.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.31.0" + version = "3.113.0" } } } 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 103/217] 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 a37d28d4e1c9b1486b7b8a6d8282da0c5cbc86f1 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 1 Aug 2024 10:38:36 +0200 Subject: [PATCH 104/217] add marco to ansible --- ansible/group_vars/all.yml | 1 + ansible/roles/common/files/ssh-keys/marcoieni.pub | 1 + 2 files changed, 2 insertions(+) create mode 100644 ansible/roles/common/files/ssh-keys/marcoieni.pub diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 772bf7d83..6aae7c7bb 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -4,6 +4,7 @@ global_sudo_users: - simulacrum - pietro - jdn + - marcoieni global_collect_metrics_from: - 52.9.166.219 # monitoring.infra.rust-lang.org diff --git a/ansible/roles/common/files/ssh-keys/marcoieni.pub b/ansible/roles/common/files/ssh-keys/marcoieni.pub new file mode 100644 index 000000000..2844e98df --- /dev/null +++ b/ansible/roles/common/files/ssh-keys/marcoieni.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBrmhY/PexymDRulNHnF1L89GLS9sa/RfDU0kd6NjIX3 From c97fada40ece07066e5e081e26456ea4c3738aa5 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 1 Aug 2024 13:40:19 +0200 Subject: [PATCH 105/217] chore(win-rustup-rs): remove unused dependency in lockfile --- .../win-rustup-rs/.terraform.lock.hcl | 19 ------------------- .../win-rustup-rs/.terraform.lock.hcl | 19 ------------------- 2 files changed, 38 deletions(-) diff --git a/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/.terraform.lock.hcl b/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/.terraform.lock.hcl index eb264ac4e..777f97bd4 100644 --- a/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/.terraform.lock.hcl @@ -23,22 +23,3 @@ provider "registry.terraform.io/hashicorp/aws" { "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } - -provider "registry.terraform.io/hashicorp/external" { - version = "2.3.3" - hashes = [ - "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", - ] -} diff --git a/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/.terraform.lock.hcl b/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/.terraform.lock.hcl index eb264ac4e..777f97bd4 100644 --- a/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/.terraform.lock.hcl @@ -23,22 +23,3 @@ provider "registry.terraform.io/hashicorp/aws" { "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } - -provider "registry.terraform.io/hashicorp/external" { - version = "2.3.3" - hashes = [ - "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", - ] -} From ffe423faf0b54400b25d8c2bc507748e61cf5b5e Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 1 Aug 2024 13:41:16 +0200 Subject: [PATCH 106/217] update rustup-prod deployed ref --- terragrunt/accounts/legacy/rustup-prod/deployed-ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/accounts/legacy/rustup-prod/deployed-ref b/terragrunt/accounts/legacy/rustup-prod/deployed-ref index 94da9a113..940419f50 100644 --- a/terragrunt/accounts/legacy/rustup-prod/deployed-ref +++ b/terragrunt/accounts/legacy/rustup-prod/deployed-ref @@ -1 +1 @@ -72f17a0c5537a8aa23271c5836fe50673e95018c +c97fada40ece07066e5e081e26456ea4c3738aa5 From aae7e59115ccc1cff7fbd397c779d1bf68969c6e Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 5 Aug 2024 10:00:34 +0200 Subject: [PATCH 107/217] chore: add force destroy to downloads s3 bucket --- terragrunt/modules/crates-io-downloads-archive/main.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/terragrunt/modules/crates-io-downloads-archive/main.tf b/terragrunt/modules/crates-io-downloads-archive/main.tf index 43673f72c..b275982cf 100644 --- a/terragrunt/modules/crates-io-downloads-archive/main.tf +++ b/terragrunt/modules/crates-io-downloads-archive/main.tf @@ -1,7 +1,8 @@ resource "aws_s3_bucket" "downloads_archive" { provider = aws.us-east-1 - bucket = var.downloads_archive_bucket_name + bucket = var.downloads_archive_bucket_name + force_destroy = true } data "aws_iam_user" "heroku_access" { From b5bbdf1767a72db1a1bf849d3a6eccc752a8fdbd Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 5 Aug 2024 10:07:02 +0200 Subject: [PATCH 108/217] chore(crates-io): destroy old downloads archive --- .../crates-io-downloads-archive/README.md | 12 -------- .../crates-io-downloads-archive/main.tf | 29 ------------------- .../crates-io-downloads-archive/variables.tf | 4 --- 3 files changed, 45 deletions(-) delete mode 100644 terragrunt/modules/crates-io-downloads-archive/README.md delete mode 100644 terragrunt/modules/crates-io-downloads-archive/main.tf delete mode 100644 terragrunt/modules/crates-io-downloads-archive/variables.tf diff --git a/terragrunt/modules/crates-io-downloads-archive/README.md b/terragrunt/modules/crates-io-downloads-archive/README.md deleted file mode 100644 index f8af15a27..000000000 --- a/terragrunt/modules/crates-io-downloads-archive/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# Archived Download Statistics for crates.io - -This module creates the infrastructure that is used to archive download -statistics from [crates.io] for longer than 90 days. Currently, that is a single -S3 bucket that stores CSV files with daily download counts. A new bucket has -been created for this purpose, as the existing buckets for [crates.io] are -publicly accessible. - -See [rust-lang/crates.io#3479] for details. - -[crates.io]: https://crates.io -[rust-lang/crates.io#3479]: https://github.com/rust-lang/crates.io/issues/3479 diff --git a/terragrunt/modules/crates-io-downloads-archive/main.tf b/terragrunt/modules/crates-io-downloads-archive/main.tf deleted file mode 100644 index b275982cf..000000000 --- a/terragrunt/modules/crates-io-downloads-archive/main.tf +++ /dev/null @@ -1,29 +0,0 @@ -resource "aws_s3_bucket" "downloads_archive" { - provider = aws.us-east-1 - - bucket = var.downloads_archive_bucket_name - force_destroy = true -} - -data "aws_iam_user" "heroku_access" { - user_name = "crates-io-heroku-access" -} - -resource "aws_iam_user_policy" "downloads_archive_write" { - name = "downloads-archive-write" - user = data.aws_iam_user.heroku_access.user_name - policy = data.aws_iam_policy_document.downloads_archive_write.json -} - -data "aws_iam_policy_document" "downloads_archive_write" { - statement { - sid = "WriteToDownloadsArchive" - effect = "Allow" - - actions = [ - "s3:PutObject", - ] - - resources = ["${aws_s3_bucket.downloads_archive.arn}/*"] - } -} diff --git a/terragrunt/modules/crates-io-downloads-archive/variables.tf b/terragrunt/modules/crates-io-downloads-archive/variables.tf deleted file mode 100644 index ca2e11544..000000000 --- a/terragrunt/modules/crates-io-downloads-archive/variables.tf +++ /dev/null @@ -1,4 +0,0 @@ -variable "downloads_archive_bucket_name" { - description = "The name of the S3 bucket to store the downloads archive" - type = string -} 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 109/217] 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 ddb32b167318e15003d4e3fd5c2dd85df606a61a Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 5 Aug 2024 11:43:59 +0200 Subject: [PATCH 110/217] update crates-io 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 4c1d31504..c030f3e3b 100644 --- a/terragrunt/accounts/legacy/crates-io-prod/deployed-ref +++ b/terragrunt/accounts/legacy/crates-io-prod/deployed-ref @@ -1 +1 @@ -73aff0e7a3e0d7cf94715a358b690682c7d6be5a +f6b400a403563fd233dcaa58cc63c05c6fd40550 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 111/217] 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 112/217] 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 113/217] 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 114/217] 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 115/217] 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 116/217] 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 117/217] 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 118/217] 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 119/217] 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 120/217] 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 121/217] 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 122/217] 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 123/217] 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 124/217] 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 125/217] 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 126/217] 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 127/217] 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 128/217] 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 From fb16857e3591cff2a38216d6abda0299c016a8dd Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:13:43 +0200 Subject: [PATCH 129/217] chore: update `hashicorp/dns` provider --- terraform/bastion/.terraform.lock.hcl | 61 ++++++++++--------- terraform/bastion/_terraform.tf | 2 +- terraform/dev-desktops/.terraform.lock.hcl | 57 ++++++++--------- terraform/playground/.terraform.lock.hcl | 58 +++++++++--------- .../westeurope/.terraform.lock.hcl | 58 +++++++++--------- .../westus2/.terraform.lock.hcl | 58 +++++++++--------- 6 files changed, 149 insertions(+), 145 deletions(-) diff --git a/terraform/bastion/.terraform.lock.hcl b/terraform/bastion/.terraform.lock.hcl index 16d67ee28..67122697e 100644 --- a/terraform/bastion/.terraform.lock.hcl +++ b/terraform/bastion/.terraform.lock.hcl @@ -2,41 +2,44 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "3.59.0" + version = "3.76.1" constraints = "~> 3.59" hashes = [ - "h1:6JlihvRdEq02BzOZ7P7De2W5HH41ASVYg5I5Z2lAhIo=", - "h1:cN7sJwv3gwrkgbZS40vbV6IOnwHY0WWsUKPQf1gErv4=", - "zh:0b33154c805071af15839184f3faafeb1549d26a2f1fe721393461790c5ddb46", - "zh:1c5c6793cbec328394c6dda686298d9f6bb7b4c6a39e3dc48dc3035dea9aeda0", - "zh:20b590b9d9f0a18fdc9f0fb18bb2d9d5349b14039899ecf66e4ae5513606405b", - "zh:3e9010dbb0655b5d05e5e98bfe3e1e73cfa5ff6b364dfd73e8eeeb5e1e58c643", - "zh:47a46895d2592fbe7c904107ab6af25abbb17de230852859c06eee95ab282823", - "zh:615745b8c25b111cfe204d52553ea530d84abba7fb8be6b5b00476184407b556", - "zh:701e0f2e5191729601b6d7591e5c3f5d77439125a74116786cca3bc6d7abf0d9", - "zh:7217637b5726bfd09dc9b4f75aef643530e8b673f6de6e06f660a70f4d3170e2", - "zh:8097811557dd5fffcc77e921d3a49dfaa203d4640ac3859a64dcd927122ade8b", - "zh:9a23df54c62dcf74e88aa309700651a6e77e173429ef0307ee15aaa7ff2f47d0", - "zh:e5fa052b9285332a1ebb360ab14676bca88efdaac96cdd809207b23f8e732bb0", + "h1:z1+WjdwuRX8Aa9a7YKXErhZ5AuvoXiDq7FHts30sZak=", + "zh:1cf933104a641ffdb64d71a76806f4df35d19101b47e0eb02c9c36bd64bfdd2d", + "zh:273afaf908775ade6c9d32462938e7739ee8b00a0de2ef3cdddc5bc115bb1d4f", + "zh:2bc24ae989e38f575de034083082c69b41c54b8df69d35728853257c400ce0f4", + "zh:53ba88dbdaf9f818d35001c3d519a787f457283d9341f562dc3d0af51fd9606e", + "zh:5cdac7afea68bbd89d3bdb345d99470226482eff41f375f220fe338d2e5808da", + "zh:63127808890ac4be6cff6554985510b15ac715df698d550a3e722722dc56523c", + "zh:97a1237791f15373743189b078a0e0f2fa4dd7d7474077423376cd186312dc55", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:a4f625e97e5f25073c08080e4a619f959bc0149fc853a6b1b49ab41d58b59665", + "zh:b56cca54019237941f7614e8d2712586a6ab3092e8e9492c70f06563259171e9", + "zh:d4bc33bfd6ac78fb61e6d48a61c179907dfdbdf149b89fb97272c663989a7fcd", + "zh:e0089d73fa56d128c574601305634a774eebacf4a84babba71da10040cecf99a", + "zh:e957531f1d92a6474c9b02bd9200da91b99ba07a0ab761c8e3176400dd41721c", + "zh:eceb85818d57d8270db4df7564cf4ed51b5c650a361aaa017c42227158e1946b", + "zh:f565e5caa1b349ec404c6d03d01c68b02233f5485ed038d0aab810dd4023a880", ] } provider "registry.terraform.io/hashicorp/dns" { - version = "3.2.1" - constraints = "~> 3.2" + version = "3.4.1" + constraints = "~> 3.4" hashes = [ - "h1:Qo7hi4WZHZsvtuJ27Owl1XiVlpanXvYFEG+ne6oDSaw=", - "h1:bGDbmpidD9CB9kWU1BGUVFPi/ZCvvlT5+iAvPw68Ho0=", - "zh:0246c961c7c9f5ef506911b3a279caebd7892d7187797f0d4f16591c438604d5", - "zh:545f7c18f916197d7f39d7de12f6022f943fddb46cf05c9b20fee9d910f04535", - "zh:5c2c8ad5dc7133de4e203b595c32387b9345e4f4a5b6b819167dc0251039257f", - "zh:66d2e38c6c23b6a5478a4f4536a3585eb7b6d507300e6e609724d193e850bbfd", - "zh:67eb15b9d86108b58d02bb240738049c1e8394b8f81881c0ee0ff5abeac914d0", - "zh:748cb4c7374e114b62caadce484f6ca2c57488c93b20a2460a4ea76b01c566e2", - "zh:769f6a016d6d83d1302c69dae852ee4a9ff7b42284c36bff825ca55b2923a65a", - "zh:77e279d8b5e0669ac8e3dfb15d7e08bcb2e68b910187b159403e7e0cf6ddb856", - "zh:836bb83f4ff360a6588c0d1b5bdfd7dc7f6835e40ca9acdc8662f8ba39c54da8", - "zh:a6735c4c3ce087a415248dcf73a73203d2489b32323d9d61c1f2496e40b1a7ae", - "zh:c838fbb97ffa6aeb966d4ae7515c5ec08876f00730298926b55bfcd013074280", + "h1:Ds8mPH2ZDdHsvcZTFaM7KgmRlyIaxv1T6zxUOioNso0=", + "zh:00fc9ba46d66a35c0f4cb66d19b402280f5d074a5652b6a378aac9b11b93d069", + "zh:0d612631e82f246d1e7ee20d3dff29ad1c328d1cec0a3b030719e6246676737b", + "zh:29b847c53ea307acf7ed923c751f3051aae3308a23ba376ad86b120c0f6b978b", + "zh:4b5612e01d369ba56abe87daaea12e65114da9befdd080bf26269dfcbd1c07fa", + "zh:5a2e3af49eabe6592bc24ff6c718872cc8a3fbc3b7be152b00d124ef1dd5d0bd", + "zh:6570128aa7cb71390f78b9aa918c937f1ab0d695e8d7a0b38b84713d2cc92893", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:874cbc34ef9973e4b1f894d910e7f853cc317ee6b5208179d41c1bfa51831425", + "zh:946d5fbe75d4fc0fdc1d2deea85a5e02ec46f6830731f9414884276b7c3ec4bc", + "zh:b1cde393e83634c733649caea76ef6f4f14f01f2b04e8c90926ccbb49ac6c53d", + "zh:b803d82cf6fc8ae6660f896144e065d6ed032273a3eb418e62b39a7dec73f734", + "zh:e8d8b93b1c13b199c929819b2b049627a6d3874fd3f16e05b3f594d526233dd6", ] } diff --git a/terraform/bastion/_terraform.tf b/terraform/bastion/_terraform.tf index 7c9e6cca7..3e9c6c432 100644 --- a/terraform/bastion/_terraform.tf +++ b/terraform/bastion/_terraform.tf @@ -10,7 +10,7 @@ terraform { } dns = { source = "hashicorp/dns" - version = "~> 3.2" + version = "~> 3.4" } } diff --git a/terraform/dev-desktops/.terraform.lock.hcl b/terraform/dev-desktops/.terraform.lock.hcl index cb98ce3ab..a27723ff3 100644 --- a/terraform/dev-desktops/.terraform.lock.hcl +++ b/terraform/dev-desktops/.terraform.lock.hcl @@ -2,42 +2,43 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "3.75.2" + version = "3.76.1" constraints = "~> 3.59" hashes = [ - "h1:x0gluX9ZKEmz+JJW3Ut5GgWDFOq/lhs2vkqJ+xt57zs=", - "h1:xXeHg5KDyH3rn2mrFh+iuvO2d9CEx8ryvOWRUMC3aWg=", - "zh:0e75fb14ec42d69bc46461dd54016bb2487d38da324222cec20863918b8954c4", - "zh:30831a1fe29f005d8b809250b43d09522288db45d474c9d238b26f40bdca2388", - "zh:36163d625ab2999c9cd31ef2475d978f9f033a8dfa0d585f1665f2d6492fac4b", - "zh:48ec39685541e4ddd8ddd196e2cfb72516b87f471d86ac3892bc11f83c573199", - "zh:707b9c8775efd6962b6226d914ab25f308013bba1f68953daa77adca99ff6807", - "zh:72bd9f4609a827afa366c6f119c7dec7d73a35d712dad1457c0497d87bf8d160", - "zh:930e3ae3d0cb152e17ee5a8aee5cb47f7613d6421bc7c22e7f50c19da484a100", + "h1:z1+WjdwuRX8Aa9a7YKXErhZ5AuvoXiDq7FHts30sZak=", + "zh:1cf933104a641ffdb64d71a76806f4df35d19101b47e0eb02c9c36bd64bfdd2d", + "zh:273afaf908775ade6c9d32462938e7739ee8b00a0de2ef3cdddc5bc115bb1d4f", + "zh:2bc24ae989e38f575de034083082c69b41c54b8df69d35728853257c400ce0f4", + "zh:53ba88dbdaf9f818d35001c3d519a787f457283d9341f562dc3d0af51fd9606e", + "zh:5cdac7afea68bbd89d3bdb345d99470226482eff41f375f220fe338d2e5808da", + "zh:63127808890ac4be6cff6554985510b15ac715df698d550a3e722722dc56523c", + "zh:97a1237791f15373743189b078a0e0f2fa4dd7d7474077423376cd186312dc55", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a19bf49b80101a0f0272b994153eeff8f8c206ecc592707bfbce7563355b6882", - "zh:a34b5d2bbaf52285b0c9a8df6258f4789f4d927ff777e126bdc77e7887abbeaa", - "zh:caad6fd5e79eae33e6d74e38c3b15c28a5482f2a1a8ca46cc1ee70089de61adb", - "zh:f2eae988635030de9a088f8058fbcd91e2014a8312a48b16bfd09a9d69d9d6f7", + "zh:a4f625e97e5f25073c08080e4a619f959bc0149fc853a6b1b49ab41d58b59665", + "zh:b56cca54019237941f7614e8d2712586a6ab3092e8e9492c70f06563259171e9", + "zh:d4bc33bfd6ac78fb61e6d48a61c179907dfdbdf149b89fb97272c663989a7fcd", + "zh:e0089d73fa56d128c574601305634a774eebacf4a84babba71da10040cecf99a", + "zh:e957531f1d92a6474c9b02bd9200da91b99ba07a0ab761c8e3176400dd41721c", + "zh:eceb85818d57d8270db4df7564cf4ed51b5c650a361aaa017c42227158e1946b", + "zh:f565e5caa1b349ec404c6d03d01c68b02233f5485ed038d0aab810dd4023a880", ] } provider "registry.terraform.io/hashicorp/dns" { - version = "3.2.3" + version = "3.4.1" hashes = [ - "h1:ALe1bPHF550GAEdEDgujL1Ea0UQ7O5KEL/jQWlCfemY=", - "h1:ODcR+vWOhCAJ2iCChZMVdRglNCx07VNr67OPLRPZyDY=", - "zh:03a304f4b76ac6c8bebffddcdf555bf77578a7f638948a681589def32e140cb8", - "zh:08c7d2498b747054e9c9df7838bfa4e4a6b5d63e2d29f0457247e384f792d56c", - "zh:20adf489819ba51ba9d9d15da2dbe1fecb92491b3d0dd80096873e5e84d8b4bd", - "zh:2959ff209d2578456ca490672b82864d483b9e9db9efc8e4ffada06e23017609", - "zh:3ecd0b22db79550fb1108ff7bd00c4066825e8c23bb64e3cc8d9b8102e8caa45", - "zh:6e53a9232245b4be52b56b078f15f270b89afe6abb9c9b8baab4a282fe0cf9f8", + "h1:Ds8mPH2ZDdHsvcZTFaM7KgmRlyIaxv1T6zxUOioNso0=", + "zh:00fc9ba46d66a35c0f4cb66d19b402280f5d074a5652b6a378aac9b11b93d069", + "zh:0d612631e82f246d1e7ee20d3dff29ad1c328d1cec0a3b030719e6246676737b", + "zh:29b847c53ea307acf7ed923c751f3051aae3308a23ba376ad86b120c0f6b978b", + "zh:4b5612e01d369ba56abe87daaea12e65114da9befdd080bf26269dfcbd1c07fa", + "zh:5a2e3af49eabe6592bc24ff6c718872cc8a3fbc3b7be152b00d124ef1dd5d0bd", + "zh:6570128aa7cb71390f78b9aa918c937f1ab0d695e8d7a0b38b84713d2cc92893", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:80437bdfa08eb90f70105b52cb06799a8f7967313654b43d28d7f654fcd4edc1", - "zh:816ddaca0ecc29e287376e5b0b8b0729ee13f23a9d74bfad5b14b7983e1a1775", - "zh:82d8ac7ad00c1a71d0a7c1aca03bb59a6b51128f895242df80b1f3d016c3c51a", - "zh:ec9243b8bd80693a6eeeea5d4f7f4e6f57bd44ae796d6d5b1a91790e359f8a61", - "zh:fd821adbfb03a2c9eac111ff27a32b3a5523b18f80333008de85482d3bbea645", + "zh:874cbc34ef9973e4b1f894d910e7f853cc317ee6b5208179d41c1bfa51831425", + "zh:946d5fbe75d4fc0fdc1d2deea85a5e02ec46f6830731f9414884276b7c3ec4bc", + "zh:b1cde393e83634c733649caea76ef6f4f14f01f2b04e8c90926ccbb49ac6c53d", + "zh:b803d82cf6fc8ae6660f896144e065d6ed032273a3eb418e62b39a7dec73f734", + "zh:e8d8b93b1c13b199c929819b2b049627a6d3874fd3f16e05b3f594d526233dd6", ] } diff --git a/terraform/playground/.terraform.lock.hcl b/terraform/playground/.terraform.lock.hcl index 6ac8152a1..c1fc0b909 100644 --- a/terraform/playground/.terraform.lock.hcl +++ b/terraform/playground/.terraform.lock.hcl @@ -2,43 +2,43 @@ # 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, ~> 4.28" 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", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } provider "registry.terraform.io/hashicorp/dns" { - version = "3.2.4" + version = "3.4.1" hashes = [ - "h1:nmem6PLPLfVqwM6ffr4Op1IblLujtJbcaG5fQtL5syI=", - "zh:13f1284887be8ebcf279e0e84d685751fbd40bd1f1abbea0ee6ba57bae5bcc4f", - "zh:22e7428d6af0cbb2191b17da9406b4cfc110ab2ce57ee818d505dbdc03cab325", - "zh:3690ec6483dd879a292592859d38391813d48f2efeceafcc7bae4a0e34cfc9f9", + "h1:Ds8mPH2ZDdHsvcZTFaM7KgmRlyIaxv1T6zxUOioNso0=", + "zh:00fc9ba46d66a35c0f4cb66d19b402280f5d074a5652b6a378aac9b11b93d069", + "zh:0d612631e82f246d1e7ee20d3dff29ad1c328d1cec0a3b030719e6246676737b", + "zh:29b847c53ea307acf7ed923c751f3051aae3308a23ba376ad86b120c0f6b978b", + "zh:4b5612e01d369ba56abe87daaea12e65114da9befdd080bf26269dfcbd1c07fa", + "zh:5a2e3af49eabe6592bc24ff6c718872cc8a3fbc3b7be152b00d124ef1dd5d0bd", + "zh:6570128aa7cb71390f78b9aa918c937f1ab0d695e8d7a0b38b84713d2cc92893", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:8a9b713c80e5fa288bd4a942974307c835c434c2370a600977abbc7e3b71fbc4", - "zh:96a033b54ec602b6daa669d4913d33ed9ad5751fafce5ec94df6c2accaa93ba5", - "zh:cc64dd880e91a32e112a0a030240f096606162da74e3a8e454c0f31553080bfd", - "zh:db30eb45ad3c295c953d8c6063354d9c3c97b7b208ae4cf8b454b4ea973c577d", - "zh:dfe060ccd4d1ea363227e9b19b87a024e75d7a1f4f5147bf367b2f5991b9667c", - "zh:f290a90e9130204bb01557a842232496c2ab0de9aa3de32fc21125d35333486b", - "zh:f688e49913c21d14765558b239a236d2cc7c7dd10c77b78e3dc1767cbd4e94ef", - "zh:fb34249421e6fd4d364518f657811e752f38d7bc234f17c0b3cb704e6f1b0057", + "zh:874cbc34ef9973e4b1f894d910e7f853cc317ee6b5208179d41c1bfa51831425", + "zh:946d5fbe75d4fc0fdc1d2deea85a5e02ec46f6830731f9414884276b7c3ec4bc", + "zh:b1cde393e83634c733649caea76ef6f4f14f01f2b04e8c90926ccbb49ac6c53d", + "zh:b803d82cf6fc8ae6660f896144e065d6ed032273a3eb418e62b39a7dec73f734", + "zh:e8d8b93b1c13b199c929819b2b049627a6d3874fd3f16e05b3f594d526233dd6", ] } diff --git a/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl index 3fa44ab1a..fb85563e2 100644 --- a/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.49.0" + version = "5.63.1" hashes = [ - "h1:RZtXnBRpO4LNmmz0tXJQLa2heqk9VFGblFZtRCZkm/M=", - "zh:0979b07cdeffb868ea605e4bbc008adc7cccb5f3ba1d3a0b794ea3e8fff20932", - "zh:2121a0a048a1d9419df69f3561e524b7e8a6b74ba0f57bd8948799f12b6ad3a1", - "zh:573362042ba0bd18e98567a4f45d91b09eb0d223513518ba04f16a646a906403", - "zh:57be7a4d6c362be2fa586d270203f4eac1ee239816239a9503b86ebc8fa1fef0", - "zh:5c72ed211d9234edd70eac9d77c3cafc7bbf819d1c28332a6d77acf227c9a23c", - "zh:7786d1a9781f8e8c0079bf58f4ed4aeddec0caf54ad7ddcf43c47936d545a04f", - "zh:82133e7d39787ee91ed41988da71beecc2ecb900b5da94b3f3d77fbc4d4dc722", - "zh:8cdb1c154dead85be8352afd30eaf41c59249de9e7e0a8eb4ab8e625b90a4922", + "h1:Wu2MrBj79v8k4hMb8GKMu5p9KpVtCjNBsZ/R5wOTgZs=", + "zh:093adc21714d264005f66002464f4e9f48d6759adaaa88ca32db0c1134c2ca2b", + "zh:15505e01889d8da3e569ae3a8300cf12e8853822a5909a54eb07cf57f17daa74", + "zh:1c64ea9ab2c4a46a2e6eeafa4069106c1d9208aa2823264e58e826049b9417f7", + "zh:1ca7e98446f519f08ad684928b8bc22d480e419b6210955af8a31730d8dbc5ad", + "zh:3bd8fe53647e17fadcfe13536160009e4bb77e1c2fe224e991c82fb228ab4ece", + "zh:68d4bd6ffba3c6484c228a1756b1c7c16802ebd58a20b8d6bfb547d96a2eaa69", + "zh:68fbabfc04bde3655ded9919f5954ab8884a35d265d41aec53f95804e741ca7c", + "zh:69c2ea737c1cfb7252f22ca7a50d8cc7a4729ea288fc3833933c2380023ca605", + "zh:796caec3b4e8d177e5e4787d7b61a8a541993edc33db2c3ffffdfdbbad3967b5", + "zh:877a02805e1b4503b4e174a34084055873619af9d9e57e7098c27d0e0be0b592", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:ac215fd1c3bd647ae38868940651b97a53197688daefcd70b3595c84560e5267", - "zh:c45db22356d20e431639061a72e07da5201f4937c1df6b9f03f32019facf3905", - "zh:c9ba90e62db9a4708ed1a4e094849f88ce9d44c52b49f613b30bb3f7523b8d97", - "zh:d2be3607be2209995c80dc1d66086d527de5d470f73509e813254067e8287106", - "zh:e3fa20090f3cebf3911fc7ef122bd8c0505e3330ab7d541fa945fea861205007", - "zh:ef1b9d5c0b6279323f2ecfc322db8083e141984cfe1bb2f33c0f4934fccb69e3", + "zh:d37f14e0807d73eff3a8384d694b4e770d41ae3286b5195927d9d809076a2d68", + "zh:e45279ca14b28647ac26dc8ca87f67da994f961e92ad316c9bc71be922c0a3fb", + "zh:e63eb4cc5b78319a26120bdce985f44ac4b1e71e43abac0eca4eaceb0af570f5", + "zh:f5c12695fcd777825434aa7aa560b6e1d851f823d75fda7c9df5c177071720a5", ] } @@ -44,20 +44,20 @@ provider "registry.terraform.io/hashicorp/azurerm" { } provider "registry.terraform.io/hashicorp/dns" { - version = "3.2.3" + version = "3.4.1" hashes = [ - "h1:ALe1bPHF550GAEdEDgujL1Ea0UQ7O5KEL/jQWlCfemY=", - "zh:03a304f4b76ac6c8bebffddcdf555bf77578a7f638948a681589def32e140cb8", - "zh:08c7d2498b747054e9c9df7838bfa4e4a6b5d63e2d29f0457247e384f792d56c", - "zh:20adf489819ba51ba9d9d15da2dbe1fecb92491b3d0dd80096873e5e84d8b4bd", - "zh:2959ff209d2578456ca490672b82864d483b9e9db9efc8e4ffada06e23017609", - "zh:3ecd0b22db79550fb1108ff7bd00c4066825e8c23bb64e3cc8d9b8102e8caa45", - "zh:6e53a9232245b4be52b56b078f15f270b89afe6abb9c9b8baab4a282fe0cf9f8", + "h1:Ds8mPH2ZDdHsvcZTFaM7KgmRlyIaxv1T6zxUOioNso0=", + "zh:00fc9ba46d66a35c0f4cb66d19b402280f5d074a5652b6a378aac9b11b93d069", + "zh:0d612631e82f246d1e7ee20d3dff29ad1c328d1cec0a3b030719e6246676737b", + "zh:29b847c53ea307acf7ed923c751f3051aae3308a23ba376ad86b120c0f6b978b", + "zh:4b5612e01d369ba56abe87daaea12e65114da9befdd080bf26269dfcbd1c07fa", + "zh:5a2e3af49eabe6592bc24ff6c718872cc8a3fbc3b7be152b00d124ef1dd5d0bd", + "zh:6570128aa7cb71390f78b9aa918c937f1ab0d695e8d7a0b38b84713d2cc92893", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:80437bdfa08eb90f70105b52cb06799a8f7967313654b43d28d7f654fcd4edc1", - "zh:816ddaca0ecc29e287376e5b0b8b0729ee13f23a9d74bfad5b14b7983e1a1775", - "zh:82d8ac7ad00c1a71d0a7c1aca03bb59a6b51128f895242df80b1f3d016c3c51a", - "zh:ec9243b8bd80693a6eeeea5d4f7f4e6f57bd44ae796d6d5b1a91790e359f8a61", - "zh:fd821adbfb03a2c9eac111ff27a32b3a5523b18f80333008de85482d3bbea645", + "zh:874cbc34ef9973e4b1f894d910e7f853cc317ee6b5208179d41c1bfa51831425", + "zh:946d5fbe75d4fc0fdc1d2deea85a5e02ec46f6830731f9414884276b7c3ec4bc", + "zh:b1cde393e83634c733649caea76ef6f4f14f01f2b04e8c90926ccbb49ac6c53d", + "zh:b803d82cf6fc8ae6660f896144e065d6ed032273a3eb418e62b39a7dec73f734", + "zh:e8d8b93b1c13b199c929819b2b049627a6d3874fd3f16e05b3f594d526233dd6", ] } diff --git a/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl index 3fa44ab1a..fb85563e2 100644 --- a/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.49.0" + version = "5.63.1" hashes = [ - "h1:RZtXnBRpO4LNmmz0tXJQLa2heqk9VFGblFZtRCZkm/M=", - "zh:0979b07cdeffb868ea605e4bbc008adc7cccb5f3ba1d3a0b794ea3e8fff20932", - "zh:2121a0a048a1d9419df69f3561e524b7e8a6b74ba0f57bd8948799f12b6ad3a1", - "zh:573362042ba0bd18e98567a4f45d91b09eb0d223513518ba04f16a646a906403", - "zh:57be7a4d6c362be2fa586d270203f4eac1ee239816239a9503b86ebc8fa1fef0", - "zh:5c72ed211d9234edd70eac9d77c3cafc7bbf819d1c28332a6d77acf227c9a23c", - "zh:7786d1a9781f8e8c0079bf58f4ed4aeddec0caf54ad7ddcf43c47936d545a04f", - "zh:82133e7d39787ee91ed41988da71beecc2ecb900b5da94b3f3d77fbc4d4dc722", - "zh:8cdb1c154dead85be8352afd30eaf41c59249de9e7e0a8eb4ab8e625b90a4922", + "h1:Wu2MrBj79v8k4hMb8GKMu5p9KpVtCjNBsZ/R5wOTgZs=", + "zh:093adc21714d264005f66002464f4e9f48d6759adaaa88ca32db0c1134c2ca2b", + "zh:15505e01889d8da3e569ae3a8300cf12e8853822a5909a54eb07cf57f17daa74", + "zh:1c64ea9ab2c4a46a2e6eeafa4069106c1d9208aa2823264e58e826049b9417f7", + "zh:1ca7e98446f519f08ad684928b8bc22d480e419b6210955af8a31730d8dbc5ad", + "zh:3bd8fe53647e17fadcfe13536160009e4bb77e1c2fe224e991c82fb228ab4ece", + "zh:68d4bd6ffba3c6484c228a1756b1c7c16802ebd58a20b8d6bfb547d96a2eaa69", + "zh:68fbabfc04bde3655ded9919f5954ab8884a35d265d41aec53f95804e741ca7c", + "zh:69c2ea737c1cfb7252f22ca7a50d8cc7a4729ea288fc3833933c2380023ca605", + "zh:796caec3b4e8d177e5e4787d7b61a8a541993edc33db2c3ffffdfdbbad3967b5", + "zh:877a02805e1b4503b4e174a34084055873619af9d9e57e7098c27d0e0be0b592", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:ac215fd1c3bd647ae38868940651b97a53197688daefcd70b3595c84560e5267", - "zh:c45db22356d20e431639061a72e07da5201f4937c1df6b9f03f32019facf3905", - "zh:c9ba90e62db9a4708ed1a4e094849f88ce9d44c52b49f613b30bb3f7523b8d97", - "zh:d2be3607be2209995c80dc1d66086d527de5d470f73509e813254067e8287106", - "zh:e3fa20090f3cebf3911fc7ef122bd8c0505e3330ab7d541fa945fea861205007", - "zh:ef1b9d5c0b6279323f2ecfc322db8083e141984cfe1bb2f33c0f4934fccb69e3", + "zh:d37f14e0807d73eff3a8384d694b4e770d41ae3286b5195927d9d809076a2d68", + "zh:e45279ca14b28647ac26dc8ca87f67da994f961e92ad316c9bc71be922c0a3fb", + "zh:e63eb4cc5b78319a26120bdce985f44ac4b1e71e43abac0eca4eaceb0af570f5", + "zh:f5c12695fcd777825434aa7aa560b6e1d851f823d75fda7c9df5c177071720a5", ] } @@ -44,20 +44,20 @@ provider "registry.terraform.io/hashicorp/azurerm" { } provider "registry.terraform.io/hashicorp/dns" { - version = "3.2.3" + version = "3.4.1" hashes = [ - "h1:ALe1bPHF550GAEdEDgujL1Ea0UQ7O5KEL/jQWlCfemY=", - "zh:03a304f4b76ac6c8bebffddcdf555bf77578a7f638948a681589def32e140cb8", - "zh:08c7d2498b747054e9c9df7838bfa4e4a6b5d63e2d29f0457247e384f792d56c", - "zh:20adf489819ba51ba9d9d15da2dbe1fecb92491b3d0dd80096873e5e84d8b4bd", - "zh:2959ff209d2578456ca490672b82864d483b9e9db9efc8e4ffada06e23017609", - "zh:3ecd0b22db79550fb1108ff7bd00c4066825e8c23bb64e3cc8d9b8102e8caa45", - "zh:6e53a9232245b4be52b56b078f15f270b89afe6abb9c9b8baab4a282fe0cf9f8", + "h1:Ds8mPH2ZDdHsvcZTFaM7KgmRlyIaxv1T6zxUOioNso0=", + "zh:00fc9ba46d66a35c0f4cb66d19b402280f5d074a5652b6a378aac9b11b93d069", + "zh:0d612631e82f246d1e7ee20d3dff29ad1c328d1cec0a3b030719e6246676737b", + "zh:29b847c53ea307acf7ed923c751f3051aae3308a23ba376ad86b120c0f6b978b", + "zh:4b5612e01d369ba56abe87daaea12e65114da9befdd080bf26269dfcbd1c07fa", + "zh:5a2e3af49eabe6592bc24ff6c718872cc8a3fbc3b7be152b00d124ef1dd5d0bd", + "zh:6570128aa7cb71390f78b9aa918c937f1ab0d695e8d7a0b38b84713d2cc92893", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:80437bdfa08eb90f70105b52cb06799a8f7967313654b43d28d7f654fcd4edc1", - "zh:816ddaca0ecc29e287376e5b0b8b0729ee13f23a9d74bfad5b14b7983e1a1775", - "zh:82d8ac7ad00c1a71d0a7c1aca03bb59a6b51128f895242df80b1f3d016c3c51a", - "zh:ec9243b8bd80693a6eeeea5d4f7f4e6f57bd44ae796d6d5b1a91790e359f8a61", - "zh:fd821adbfb03a2c9eac111ff27a32b3a5523b18f80333008de85482d3bbea645", + "zh:874cbc34ef9973e4b1f894d910e7f853cc317ee6b5208179d41c1bfa51831425", + "zh:946d5fbe75d4fc0fdc1d2deea85a5e02ec46f6830731f9414884276b7c3ec4bc", + "zh:b1cde393e83634c733649caea76ef6f4f14f01f2b04e8c90926ccbb49ac6c53d", + "zh:b803d82cf6fc8ae6660f896144e065d6ed032273a3eb418e62b39a7dec73f734", + "zh:e8d8b93b1c13b199c929819b2b049627a6d3874fd3f16e05b3f594d526233dd6", ] } From 5a299eeb96b85fb4aead29dff04af3f2f9b07153 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:22:54 +0200 Subject: [PATCH 130/217] chore: update azurerm terraform provider --- .../resource-group/.terraform.lock.hcl | 60 +++++++++---------- .../westeurope/.terraform.lock.hcl | 28 ++++----- .../westus2/.terraform.lock.hcl | 28 ++++----- .../modules/dev-desktops-azure/_terraform.tf | 2 +- .../modules/resource-group/_terraform.tf | 2 +- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl index c1ebce63b..468a46f0e 100644 --- a/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl @@ -2,43 +2,43 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.60.0" + version = "5.63.1" hashes = [ - "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", - "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", - "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", - "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", - "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", - "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", - "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", - "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", - "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", + "h1:Wu2MrBj79v8k4hMb8GKMu5p9KpVtCjNBsZ/R5wOTgZs=", + "zh:093adc21714d264005f66002464f4e9f48d6759adaaa88ca32db0c1134c2ca2b", + "zh:15505e01889d8da3e569ae3a8300cf12e8853822a5909a54eb07cf57f17daa74", + "zh:1c64ea9ab2c4a46a2e6eeafa4069106c1d9208aa2823264e58e826049b9417f7", + "zh:1ca7e98446f519f08ad684928b8bc22d480e419b6210955af8a31730d8dbc5ad", + "zh:3bd8fe53647e17fadcfe13536160009e4bb77e1c2fe224e991c82fb228ab4ece", + "zh:68d4bd6ffba3c6484c228a1756b1c7c16802ebd58a20b8d6bfb547d96a2eaa69", + "zh:68fbabfc04bde3655ded9919f5954ab8884a35d265d41aec53f95804e741ca7c", + "zh:69c2ea737c1cfb7252f22ca7a50d8cc7a4729ea288fc3833933c2380023ca605", + "zh:796caec3b4e8d177e5e4787d7b61a8a541993edc33db2c3ffffdfdbbad3967b5", + "zh:877a02805e1b4503b4e174a34084055873619af9d9e57e7098c27d0e0be0b592", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", - "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", - "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", - "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", - "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", - "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", + "zh:d37f14e0807d73eff3a8384d694b4e770d41ae3286b5195927d9d809076a2d68", + "zh:e45279ca14b28647ac26dc8ca87f67da994f961e92ad316c9bc71be922c0a3fb", + "zh:e63eb4cc5b78319a26120bdce985f44ac4b1e71e43abac0eca4eaceb0af570f5", + "zh:f5c12695fcd777825434aa7aa560b6e1d851f823d75fda7c9df5c177071720a5", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.113.0" - constraints = "3.113.0" + version = "3.116.0" + constraints = "3.116.0" hashes = [ - "h1:SbNQLapCxbTbhM37LaRALPizAZMiA5sTRC09sUWgZOo=", - "zh:12479f5664288943400447b55e50df675c28ae82ad8d373cc2e5682f3a3411f0", - "zh:1b42a14e80e568429d3b55fed753ca3ef0df9dcdfa107890d7264599c020940f", - "zh:381be6ca617f848de3baa3985a6e1788e91a803afe04a3c5c727453528b6310d", - "zh:3e70e2e07b6db1c363de3e5d0ca47f27fc956473df03329c7d2e54d3ac29176b", - "zh:87c7633aeaa828098c6055da9e67d4acaf4b46748b6b3f0267e105e55f05de25", - "zh:8d0d98226901f874770dd5220d4701a12ae8bd586994615aa7dcba12b9736bec", - "zh:9fd913acd42a60c3a90a18ce803567ef861db8779a59aacced91f2cbd86de9d9", - "zh:b6f3f7ae0a055437fb36c139af9bb3135e7f4dad172157ae1eb0177dc74d703f", - "zh:b927027ba2bf40d34e03d742fd2b6c5299023b5ab8e6f05e50aac76a46ad1094", - "zh:ceb5187b9d2a439f4e48944f3ffeeeaf47a03dbe6f3325ea1775bf659ce0aa88", + "h1:BCR3NIorFSvGG3v/+JOiiw3VM4PkChLO4m84wzD9NDo=", + "zh:02b6606aff025fc2a962b3e568e000300abe959adac987183c24dac8eb057f4d", + "zh:2a23a8ce24ff9e885925ffee0c3ea7eadba7a702541d05869275778aa47bdea7", + "zh:57d10746384baeca4d5c56e88872727cdc150f437b8c5e14f0542127f7475e24", + "zh:59e3ebde1a2e1e094c671e179f231ead60684390dbf02d2b1b7fe67a228daa1a", + "zh:5f1f5c7d09efa2ee8ddf21bd9efbbf8286f6e90047556bef305c062fa0ac5880", + "zh:a40646aee3c9907276dab926e6123a8d70b1e56174836d4c59a9992034f88d70", + "zh:c21d40461bc5836cf56ad3d93d2fc47f61138574a55e972ad5ff1cb73bab66dc", + "zh:c56fb91a5ae66153ba0f737a26da1b3d4f88fdef7d41c63e06c5772d93b26953", + "zh:d1e60e85f51d12fc150aeab8e31d3f18f859c32f927f99deb5b74cb1e10087aa", + "zh:ed35e727e7d79e687cd3d148f52b442961ede286e7c5b4da1dcd9f0128009466", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fb9d78dfeca7489bffca9b1a1f3abee7f16dbbcba31388aea1102062c1d6dce8", + "zh:f6d2a4e7c58f44e7d04a4a9c73f35ed452f412c97c85def68c4b52814cbe03ab", ] } diff --git a/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl index fb85563e2..6ef2310db 100644 --- a/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl @@ -24,22 +24,22 @@ provider "registry.terraform.io/hashicorp/aws" { } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.31.0" - constraints = "3.31.0" + version = "3.116.0" + constraints = "3.116.0" hashes = [ - "h1:zc5rG3g3DUeQQEYpCfqm0tCAlfqxeXc74iQ95EgDv/0=", - "zh:1b61b26373bbb06e811e4ccb762651354d776db574ec904ac32835c98322ab98", - "zh:2ccea8876e54127e16729c09e9c59d164abc2a600230d3fc8331c459f91187af", - "zh:300f35a16f08a19eed08708561ecca044bc570d91e7f863f2b203c78e9df3a5f", - "zh:4e77936cbf555ea068a63095072ad7b636b598da02629375925f8ac539313f96", - "zh:63486a678e9e536a3a996dd2698b7d39d3b65d83a79e14b5520d5e26bde76d47", - "zh:8c620e70cae53b7c9ed923596d441fa5f09ff50bd1379b936e4a88211de86951", - "zh:91cc1b9bc3dfcadfe40750872baf254a8b1f715e2784e3f323edcfebfe5a4012", - "zh:b0b4c3064a58f831ad7ee36baee9bb18fc24cab8ca76902fec8bbc95aefffadf", - "zh:b70ea503c093d6d4fbbcd064c93a2139c8424a6ade6a7d9d869cd7c367f0b050", - "zh:d9738184fccca96bec3ded26c2e10c104423330be25a473d4e5e383b2161cdfe", + "h1:BCR3NIorFSvGG3v/+JOiiw3VM4PkChLO4m84wzD9NDo=", + "zh:02b6606aff025fc2a962b3e568e000300abe959adac987183c24dac8eb057f4d", + "zh:2a23a8ce24ff9e885925ffee0c3ea7eadba7a702541d05869275778aa47bdea7", + "zh:57d10746384baeca4d5c56e88872727cdc150f437b8c5e14f0542127f7475e24", + "zh:59e3ebde1a2e1e094c671e179f231ead60684390dbf02d2b1b7fe67a228daa1a", + "zh:5f1f5c7d09efa2ee8ddf21bd9efbbf8286f6e90047556bef305c062fa0ac5880", + "zh:a40646aee3c9907276dab926e6123a8d70b1e56174836d4c59a9992034f88d70", + "zh:c21d40461bc5836cf56ad3d93d2fc47f61138574a55e972ad5ff1cb73bab66dc", + "zh:c56fb91a5ae66153ba0f737a26da1b3d4f88fdef7d41c63e06c5772d93b26953", + "zh:d1e60e85f51d12fc150aeab8e31d3f18f859c32f927f99deb5b74cb1e10087aa", + "zh:ed35e727e7d79e687cd3d148f52b442961ede286e7c5b4da1dcd9f0128009466", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fcf1630b47bfae8e9834390b1a5cf4f6fd9ff0cc1ca596e6b60e9327db7529f4", + "zh:f6d2a4e7c58f44e7d04a4a9c73f35ed452f412c97c85def68c4b52814cbe03ab", ] } diff --git a/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl index fb85563e2..6ef2310db 100644 --- a/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl @@ -24,22 +24,22 @@ provider "registry.terraform.io/hashicorp/aws" { } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.31.0" - constraints = "3.31.0" + version = "3.116.0" + constraints = "3.116.0" hashes = [ - "h1:zc5rG3g3DUeQQEYpCfqm0tCAlfqxeXc74iQ95EgDv/0=", - "zh:1b61b26373bbb06e811e4ccb762651354d776db574ec904ac32835c98322ab98", - "zh:2ccea8876e54127e16729c09e9c59d164abc2a600230d3fc8331c459f91187af", - "zh:300f35a16f08a19eed08708561ecca044bc570d91e7f863f2b203c78e9df3a5f", - "zh:4e77936cbf555ea068a63095072ad7b636b598da02629375925f8ac539313f96", - "zh:63486a678e9e536a3a996dd2698b7d39d3b65d83a79e14b5520d5e26bde76d47", - "zh:8c620e70cae53b7c9ed923596d441fa5f09ff50bd1379b936e4a88211de86951", - "zh:91cc1b9bc3dfcadfe40750872baf254a8b1f715e2784e3f323edcfebfe5a4012", - "zh:b0b4c3064a58f831ad7ee36baee9bb18fc24cab8ca76902fec8bbc95aefffadf", - "zh:b70ea503c093d6d4fbbcd064c93a2139c8424a6ade6a7d9d869cd7c367f0b050", - "zh:d9738184fccca96bec3ded26c2e10c104423330be25a473d4e5e383b2161cdfe", + "h1:BCR3NIorFSvGG3v/+JOiiw3VM4PkChLO4m84wzD9NDo=", + "zh:02b6606aff025fc2a962b3e568e000300abe959adac987183c24dac8eb057f4d", + "zh:2a23a8ce24ff9e885925ffee0c3ea7eadba7a702541d05869275778aa47bdea7", + "zh:57d10746384baeca4d5c56e88872727cdc150f437b8c5e14f0542127f7475e24", + "zh:59e3ebde1a2e1e094c671e179f231ead60684390dbf02d2b1b7fe67a228daa1a", + "zh:5f1f5c7d09efa2ee8ddf21bd9efbbf8286f6e90047556bef305c062fa0ac5880", + "zh:a40646aee3c9907276dab926e6123a8d70b1e56174836d4c59a9992034f88d70", + "zh:c21d40461bc5836cf56ad3d93d2fc47f61138574a55e972ad5ff1cb73bab66dc", + "zh:c56fb91a5ae66153ba0f737a26da1b3d4f88fdef7d41c63e06c5772d93b26953", + "zh:d1e60e85f51d12fc150aeab8e31d3f18f859c32f927f99deb5b74cb1e10087aa", + "zh:ed35e727e7d79e687cd3d148f52b442961ede286e7c5b4da1dcd9f0128009466", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fcf1630b47bfae8e9834390b1a5cf4f6fd9ff0cc1ca596e6b60e9327db7529f4", + "zh:f6d2a4e7c58f44e7d04a4a9c73f35ed452f412c97c85def68c4b52814cbe03ab", ] } diff --git a/terragrunt/modules/dev-desktops-azure/_terraform.tf b/terragrunt/modules/dev-desktops-azure/_terraform.tf index f2661dd56..89db8d2a4 100644 --- a/terragrunt/modules/dev-desktops-azure/_terraform.tf +++ b/terragrunt/modules/dev-desktops-azure/_terraform.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.31.0" + version = "3.116.0" } } } diff --git a/terragrunt/modules/resource-group/_terraform.tf b/terragrunt/modules/resource-group/_terraform.tf index 32f8fc632..9eeb37052 100644 --- a/terragrunt/modules/resource-group/_terraform.tf +++ b/terragrunt/modules/resource-group/_terraform.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.113.0" + version = "3.116.0" } } } From fb64504325e1e43ba86d474420e509110e86e9f5 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 22 Aug 2024 12:29:01 +0200 Subject: [PATCH 131/217] chore: update team-members-access to aws 4.67 --- .../team-members-access/.terraform.lock.hcl | 33 ++++++++++--------- terraform/team-members-access/_terraform.tf | 5 ++- terraform/team-members-access/docs-rs.tf | 4 +-- terraform/team-members-access/mods-discord.tf | 2 +- terraform/team-members-access/rustc-perf.tf | 4 +-- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/terraform/team-members-access/.terraform.lock.hcl b/terraform/team-members-access/.terraform.lock.hcl index 07e62b3b7..e377b9efd 100644 --- a/terraform/team-members-access/.terraform.lock.hcl +++ b/terraform/team-members-access/.terraform.lock.hcl @@ -2,21 +2,24 @@ # 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.67" hashes = [ - "h1:6JlihvRdEq02BzOZ7P7De2W5HH41ASVYg5I5Z2lAhIo=", - "h1:cN7sJwv3gwrkgbZS40vbV6IOnwHY0WWsUKPQf1gErv4=", - "zh:0b33154c805071af15839184f3faafeb1549d26a2f1fe721393461790c5ddb46", - "zh:1c5c6793cbec328394c6dda686298d9f6bb7b4c6a39e3dc48dc3035dea9aeda0", - "zh:20b590b9d9f0a18fdc9f0fb18bb2d9d5349b14039899ecf66e4ae5513606405b", - "zh:3e9010dbb0655b5d05e5e98bfe3e1e73cfa5ff6b364dfd73e8eeeb5e1e58c643", - "zh:47a46895d2592fbe7c904107ab6af25abbb17de230852859c06eee95ab282823", - "zh:615745b8c25b111cfe204d52553ea530d84abba7fb8be6b5b00476184407b556", - "zh:701e0f2e5191729601b6d7591e5c3f5d77439125a74116786cca3bc6d7abf0d9", - "zh:7217637b5726bfd09dc9b4f75aef643530e8b673f6de6e06f660a70f4d3170e2", - "zh:8097811557dd5fffcc77e921d3a49dfaa203d4640ac3859a64dcd927122ade8b", - "zh:9a23df54c62dcf74e88aa309700651a6e77e173429ef0307ee15aaa7ff2f47d0", - "zh:e5fa052b9285332a1ebb360ab14676bca88efdaac96cdd809207b23f8e732bb0", + "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/terraform/team-members-access/_terraform.tf b/terraform/team-members-access/_terraform.tf index 6564e3c29..5a97e49d0 100644 --- a/terraform/team-members-access/_terraform.tf +++ b/terraform/team-members-access/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 3.59" + version = "~> 4.67" } } @@ -20,6 +20,5 @@ terraform { } provider "aws" { - profile = "default" - region = "us-west-1" + region = "us-west-1" } diff --git a/terraform/team-members-access/docs-rs.tf b/terraform/team-members-access/docs-rs.tf index 354a6cc2f..436c0323f 100644 --- a/terraform/team-members-access/docs-rs.tf +++ b/terraform/team-members-access/docs-rs.tf @@ -141,8 +141,8 @@ resource "aws_iam_group_policy" "docs_rs" { "logs:DescribeLogStreams", ] Resource = [ - data.aws_cloudwatch_log_group.docs_rs_web.arn, - "${data.aws_cloudwatch_log_group.docs_rs_web.arn}:log-stream:*", + "${data.aws_cloudwatch_log_group.docs_rs_web.arn}:*", + "${data.aws_cloudwatch_log_group.docs_rs_web.arn}:*:log-stream:*", ] }, ] diff --git a/terraform/team-members-access/mods-discord.tf b/terraform/team-members-access/mods-discord.tf index 5a90d0525..8cf52d432 100644 --- a/terraform/team-members-access/mods-discord.tf +++ b/terraform/team-members-access/mods-discord.tf @@ -52,7 +52,7 @@ resource "aws_iam_group_policy" "mods_discord" { "logs:FilterLogEvents", "logs:GetLogEvents", ] - Resource = "${data.aws_cloudwatch_log_group.ecs_discord_mods_bot.arn}" + Resource = "${data.aws_cloudwatch_log_group.ecs_discord_mods_bot.arn}:*" }, // Access to the credentials to connect to the discord-mods-bot database diff --git a/terraform/team-members-access/rustc-perf.tf b/terraform/team-members-access/rustc-perf.tf index 8560cab59..047c5063b 100644 --- a/terraform/team-members-access/rustc-perf.tf +++ b/terraform/team-members-access/rustc-perf.tf @@ -49,8 +49,8 @@ resource "aws_iam_group_policy" "rustc_perf" { ] Resource = [ "arn:aws:logs:${data.aws_arn.logs.region}:${data.aws_arn.logs.account}:log-group:*", - data.aws_cloudwatch_log_group.rustc_perf_web.arn, - "${data.aws_cloudwatch_log_group.rustc_perf_web.arn}:log-stream:*", + "${data.aws_cloudwatch_log_group.rustc_perf_web.arn}:*", + "${data.aws_cloudwatch_log_group.rustc_perf_web.arn}:*:log-stream:*", ] }, ] From 5de579c2ef8bf706648d73473ece75588a732fa5 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 22 Aug 2024 12:35:06 +0200 Subject: [PATCH 132/217] chore: update discord-mods-bot to aws 4.67 --- .../discord-mods-bot/.terraform.lock.hcl | 32 +++++++++++-------- terraform/discord-mods-bot/_terraform.tf | 5 ++- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/terraform/discord-mods-bot/.terraform.lock.hcl b/terraform/discord-mods-bot/.terraform.lock.hcl index de6a41780..e377b9efd 100644 --- a/terraform/discord-mods-bot/.terraform.lock.hcl +++ b/terraform/discord-mods-bot/.terraform.lock.hcl @@ -2,20 +2,24 @@ # 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.67" 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", + "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/terraform/discord-mods-bot/_terraform.tf b/terraform/discord-mods-bot/_terraform.tf index d27c00e42..0f646d7d1 100644 --- a/terraform/discord-mods-bot/_terraform.tf +++ b/terraform/discord-mods-bot/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 3.59" + version = "~> 4.67" } } @@ -29,6 +29,5 @@ data "terraform_remote_state" "shared" { } provider "aws" { - profile = "default" - region = "us-west-1" + region = "us-west-1" } From b9ac3a4012b3ad4c7bba7286780b293c2764da26 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 22 Aug 2024 17:55:36 +0200 Subject: [PATCH 133/217] feat(aws-creds): optionally read TOTP code from TOTP_CODE env var --- aws-creds.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aws-creds.py b/aws-creds.py index 587c71559..923bae077 100755 --- a/aws-creds.py +++ b/aws-creds.py @@ -2,6 +2,7 @@ import getpass import json +import os import pathlib import subprocess import sys @@ -27,7 +28,9 @@ def main(): serial = cached(MFA_CACHE_PATH, lambda: load_mfa_device()) eprint(f"using MFA device with serial ID {serial}") - code = getpass.getpass("TOTP code: ") + code = os.getenv("TOTP_CODE") + if not code: + code = getpass.getpass("TOTP code: ") env = get_session_token(SESSION_DURATION, serial, code) dump_env_bash(env) From 7835d002b37032ed400a21f804cfbbf63f2a5c62 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 22 Aug 2024 18:35:55 +0200 Subject: [PATCH 134/217] chore: update bastion to aws 4.67 --- terraform/bastion/.terraform.lock.hcl | 34 +++++++++++++-------------- terraform/bastion/_terraform.tf | 5 ++-- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/terraform/bastion/.terraform.lock.hcl b/terraform/bastion/.terraform.lock.hcl index 67122697e..5c6d4f85c 100644 --- a/terraform/bastion/.terraform.lock.hcl +++ b/terraform/bastion/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "3.76.1" - constraints = "~> 3.59" + version = "4.67.0" + constraints = "~> 4.67" hashes = [ - "h1:z1+WjdwuRX8Aa9a7YKXErhZ5AuvoXiDq7FHts30sZak=", - "zh:1cf933104a641ffdb64d71a76806f4df35d19101b47e0eb02c9c36bd64bfdd2d", - "zh:273afaf908775ade6c9d32462938e7739ee8b00a0de2ef3cdddc5bc115bb1d4f", - "zh:2bc24ae989e38f575de034083082c69b41c54b8df69d35728853257c400ce0f4", - "zh:53ba88dbdaf9f818d35001c3d519a787f457283d9341f562dc3d0af51fd9606e", - "zh:5cdac7afea68bbd89d3bdb345d99470226482eff41f375f220fe338d2e5808da", - "zh:63127808890ac4be6cff6554985510b15ac715df698d550a3e722722dc56523c", - "zh:97a1237791f15373743189b078a0e0f2fa4dd7d7474077423376cd186312dc55", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a4f625e97e5f25073c08080e4a619f959bc0149fc853a6b1b49ab41d58b59665", - "zh:b56cca54019237941f7614e8d2712586a6ab3092e8e9492c70f06563259171e9", - "zh:d4bc33bfd6ac78fb61e6d48a61c179907dfdbdf149b89fb97272c663989a7fcd", - "zh:e0089d73fa56d128c574601305634a774eebacf4a84babba71da10040cecf99a", - "zh:e957531f1d92a6474c9b02bd9200da91b99ba07a0ab761c8e3176400dd41721c", - "zh:eceb85818d57d8270db4df7564cf4ed51b5c650a361aaa017c42227158e1946b", - "zh:f565e5caa1b349ec404c6d03d01c68b02233f5485ed038d0aab810dd4023a880", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } diff --git a/terraform/bastion/_terraform.tf b/terraform/bastion/_terraform.tf index 3e9c6c432..00b177561 100644 --- a/terraform/bastion/_terraform.tf +++ b/terraform/bastion/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 3.59" + version = "~> 4.67" } dns = { source = "hashicorp/dns" @@ -24,8 +24,7 @@ terraform { } provider "aws" { - profile = "default" - region = "us-west-1" + region = "us-west-1" } data "terraform_remote_state" "shared" { From eafb715f80664e71caba75dddb6a36e4d2d9d9fe Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 22 Aug 2024 18:43:33 +0200 Subject: [PATCH 135/217] chore: update dev-desktops to aws 4.67 --- terraform/dev-desktops/.terraform.lock.hcl | 34 +++++++++---------- terraform/dev-desktops/_terraform.tf | 15 ++++---- .../dev-desktops/aws-region/_terraform.tf | 2 +- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/terraform/dev-desktops/.terraform.lock.hcl b/terraform/dev-desktops/.terraform.lock.hcl index a27723ff3..3fdeb1389 100644 --- a/terraform/dev-desktops/.terraform.lock.hcl +++ b/terraform/dev-desktops/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "3.76.1" - constraints = "~> 3.59" + version = "4.67.0" + constraints = "~> 4.67" hashes = [ - "h1:z1+WjdwuRX8Aa9a7YKXErhZ5AuvoXiDq7FHts30sZak=", - "zh:1cf933104a641ffdb64d71a76806f4df35d19101b47e0eb02c9c36bd64bfdd2d", - "zh:273afaf908775ade6c9d32462938e7739ee8b00a0de2ef3cdddc5bc115bb1d4f", - "zh:2bc24ae989e38f575de034083082c69b41c54b8df69d35728853257c400ce0f4", - "zh:53ba88dbdaf9f818d35001c3d519a787f457283d9341f562dc3d0af51fd9606e", - "zh:5cdac7afea68bbd89d3bdb345d99470226482eff41f375f220fe338d2e5808da", - "zh:63127808890ac4be6cff6554985510b15ac715df698d550a3e722722dc56523c", - "zh:97a1237791f15373743189b078a0e0f2fa4dd7d7474077423376cd186312dc55", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a4f625e97e5f25073c08080e4a619f959bc0149fc853a6b1b49ab41d58b59665", - "zh:b56cca54019237941f7614e8d2712586a6ab3092e8e9492c70f06563259171e9", - "zh:d4bc33bfd6ac78fb61e6d48a61c179907dfdbdf149b89fb97272c663989a7fcd", - "zh:e0089d73fa56d128c574601305634a774eebacf4a84babba71da10040cecf99a", - "zh:e957531f1d92a6474c9b02bd9200da91b99ba07a0ab761c8e3176400dd41721c", - "zh:eceb85818d57d8270db4df7564cf4ed51b5c650a361aaa017c42227158e1946b", - "zh:f565e5caa1b349ec404c6d03d01c68b02233f5485ed038d0aab810dd4023a880", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } diff --git a/terraform/dev-desktops/_terraform.tf b/terraform/dev-desktops/_terraform.tf index 59842aa51..1f755499d 100644 --- a/terraform/dev-desktops/_terraform.tf +++ b/terraform/dev-desktops/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 3.59" + version = "~> 4.67" } } @@ -29,18 +29,15 @@ data "terraform_remote_state" "shared" { } provider "aws" { - profile = "default" - region = "us-west-1" + region = "us-west-1" } provider "aws" { - alias = "eu-central-1" - profile = "default" - region = "eu-central-1" + alias = "eu-central-1" + region = "eu-central-1" } provider "aws" { - alias = "us-east-1" - profile = "default" - region = "us-east-1" + alias = "us-east-1" + region = "us-east-1" } diff --git a/terraform/dev-desktops/aws-region/_terraform.tf b/terraform/dev-desktops/aws-region/_terraform.tf index b680fd479..702a1fb4e 100644 --- a/terraform/dev-desktops/aws-region/_terraform.tf +++ b/terraform/dev-desktops/aws-region/_terraform.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 3.59" + version = "~> 4.67" } } } From 52e57e011bb173cfdb707e83518056cdc50e2697 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 22 Aug 2024 19:04:19 +0200 Subject: [PATCH 136/217] chore: update domain-redirects to aws 4.67 --- .../domain-redirects/.terraform.lock.hcl | 31 ++++++++++--------- terraform/domain-redirects/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/terraform/domain-redirects/.terraform.lock.hcl b/terraform/domain-redirects/.terraform.lock.hcl index bc730bc8f..c1a7e9c63 100644 --- a/terraform/domain-redirects/.terraform.lock.hcl +++ b/terraform/domain-redirects/.terraform.lock.hcl @@ -2,21 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.23.0" - constraints = "~> 4.20" + version = "4.67.0" + constraints = "~> 4.20, ~> 4.67" hashes = [ - "h1:JDJLmKK61GLw8gHQtCzmvlwPNZIu46/M5uBg/TDlBa0=", - "zh:17adbedc9a80afc571a8de7b9bfccbe2359e2b3ce1fffd02b456d92248ec9294", - "zh:23d8956b031d78466de82a3d2bbe8c76cc58482c931af311580b8eaef4e6a38f", - "zh:343fe19e9a9f3021e26f4af68ff7f4828582070f986b6e5e5b23d89df5514643", - "zh:6b8ff83d884b161939b90a18a4da43dd464c4b984f54b5f537b2870ce6bd94bc", - "zh:7777d614d5e9d589ad5508eecf4c6d8f47d50fcbaf5d40fa7921064240a6b440", - "zh:82f4578861a6fd0cde9a04a1926920bd72d993d524e5b34d7738d4eff3634c44", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a08fefc153bbe0586389e814979cf7185c50fcddbb2082725991ed02742e7d1e", - "zh:ae789c0e7cb777d98934387f8888090ccb2d8973ef10e5ece541e8b624e1fb00", - "zh:b4608aab78b4dbb32c629595797107fc5a84d1b8f0682f183793d13837f0ecf0", - "zh:ed2c791c2354764b565f9ba4be7fc845c619c1a32cefadd3154a5665b312ab00", - "zh:f94ac0072a8545eebabf417bc0acbdc77c31c006ad8760834ee8ee5cdb64e743", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } diff --git a/terraform/domain-redirects/_terraform.tf b/terraform/domain-redirects/_terraform.tf index 09cbfb79c..91640de9f 100644 --- a/terraform/domain-redirects/_terraform.tf +++ b/terraform/domain-redirects/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 4.67" } } From 4cba831dae9e53382b4df0e3498a270c150b7956 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 22 Aug 2024 19:07:41 +0200 Subject: [PATCH 137/217] chore: update rust-forge to aws 4.67 --- terraform/rust-forge/.terraform.lock.hcl | 31 +++++++++++++----------- terraform/rust-forge/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/terraform/rust-forge/.terraform.lock.hcl b/terraform/rust-forge/.terraform.lock.hcl index ee1a66322..77adfed63 100644 --- a/terraform/rust-forge/.terraform.lock.hcl +++ b/terraform/rust-forge/.terraform.lock.hcl @@ -2,21 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.28.0" - constraints = "~> 4.28" + version = "4.67.0" + constraints = "~> 4.20, ~> 4.28" hashes = [ - "h1:TXCUuuaf2q54C43bxSNiF9g+cxTr8zqEZem0pW15cjE=", - "zh:1d4806e50971d2cd565273cedf3206e38931677a6f546cf2b9fb140b52b80604", - "zh:3f076791002b8afa5ba2d2038f1e1db5956022327eb5242152723ed410ae4571", - "zh:40e5944a9df0d083dbd316bcc6ac9ceada5c00dab70c21897e62b68c4c936bc9", - "zh:68b78d0c1866aa0bcbbadb1cf51349c9af697f8789f5778b7e7e2912a9c4845d", - "zh:72d6e66136841c0e5ae264e03555cf59751ddae1b9784eafcb877c624332c70a", - "zh:902c8f89dc10d321b87c09270c27a31a42d4e74e4da1608e55b7f241cd010a62", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:bf54c9f55d420b4e1fe68db81a759c40b9f9747159dea3061212a1c9768dcdfd", - "zh:bfbe7e745c420a4ebd27ca35dfe5c2acc7cdd05092e1daf60f5ae29a1130d752", - "zh:d271a30b16f0861f020e423d120d1458cf1757e740e016ace22084c39dc13550", - "zh:f1e4672d1625fd1f1268d4b807cb90e28150d46fb2d0dd0836de65db29c8d5e6", - "zh:f5cee910b4db2da3c2a28dae9055cbca4273eb774c362bb7bb5bde04deff4557", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } diff --git a/terraform/rust-forge/_terraform.tf b/terraform/rust-forge/_terraform.tf index f6e30a3ca..db39c3fca 100644 --- a/terraform/rust-forge/_terraform.tf +++ b/terraform/rust-forge/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.28" + version = "~> 4.67" } } From 24a9a4d06cc80e1d4d820f852df26ec9b76b8cce Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 23 Aug 2024 15:39:23 +0200 Subject: [PATCH 138/217] chore(rds-database): update AWS provider to version 4.67 --- terraform/rds-databases/.terraform.lock.hcl | 34 ++++++++++----------- terraform/rds-databases/_terraform.tf | 5 ++- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/terraform/rds-databases/.terraform.lock.hcl b/terraform/rds-databases/.terraform.lock.hcl index 5eb5c12aa..12ec305c9 100644 --- a/terraform/rds-databases/.terraform.lock.hcl +++ b/terraform/rds-databases/.terraform.lock.hcl @@ -24,25 +24,25 @@ provider "registry.terraform.io/cyrilgdn/postgresql" { } provider "registry.terraform.io/hashicorp/aws" { - version = "3.76.1" - constraints = "~> 3.59" + version = "4.67.0" + constraints = "~> 4.67" hashes = [ - "h1:z1+WjdwuRX8Aa9a7YKXErhZ5AuvoXiDq7FHts30sZak=", - "zh:1cf933104a641ffdb64d71a76806f4df35d19101b47e0eb02c9c36bd64bfdd2d", - "zh:273afaf908775ade6c9d32462938e7739ee8b00a0de2ef3cdddc5bc115bb1d4f", - "zh:2bc24ae989e38f575de034083082c69b41c54b8df69d35728853257c400ce0f4", - "zh:53ba88dbdaf9f818d35001c3d519a787f457283d9341f562dc3d0af51fd9606e", - "zh:5cdac7afea68bbd89d3bdb345d99470226482eff41f375f220fe338d2e5808da", - "zh:63127808890ac4be6cff6554985510b15ac715df698d550a3e722722dc56523c", - "zh:97a1237791f15373743189b078a0e0f2fa4dd7d7474077423376cd186312dc55", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a4f625e97e5f25073c08080e4a619f959bc0149fc853a6b1b49ab41d58b59665", - "zh:b56cca54019237941f7614e8d2712586a6ab3092e8e9492c70f06563259171e9", - "zh:d4bc33bfd6ac78fb61e6d48a61c179907dfdbdf149b89fb97272c663989a7fcd", - "zh:e0089d73fa56d128c574601305634a774eebacf4a84babba71da10040cecf99a", - "zh:e957531f1d92a6474c9b02bd9200da91b99ba07a0ab761c8e3176400dd41721c", - "zh:eceb85818d57d8270db4df7564cf4ed51b5c650a361aaa017c42227158e1946b", - "zh:f565e5caa1b349ec404c6d03d01c68b02233f5485ed038d0aab810dd4023a880", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } diff --git a/terraform/rds-databases/_terraform.tf b/terraform/rds-databases/_terraform.tf index 3848bb1f3..a1cb4edc1 100644 --- a/terraform/rds-databases/_terraform.tf +++ b/terraform/rds-databases/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 3.59" + version = "~> 4.67" } postgresql = { source = "cyrilgdn/postgresql" @@ -37,8 +37,7 @@ data "terraform_remote_state" "shared" { } provider "aws" { - profile = "default" - region = "us-west-1" + region = "us-west-1" } provider "postgresql" { From 324ddb31421c7fc08985fa767d78b0f99ffa59ff Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 23 Aug 2024 15:45:02 +0200 Subject: [PATCH 139/217] chore(rds-databases): update AWS provider to version 5.64 --- terraform/rds-databases/.terraform.lock.hcl | 34 ++++++++++----------- terraform/rds-databases/_terraform.tf | 4 +-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/terraform/rds-databases/.terraform.lock.hcl b/terraform/rds-databases/.terraform.lock.hcl index 12ec305c9..067e1c3f3 100644 --- a/terraform/rds-databases/.terraform.lock.hcl +++ b/terraform/rds-databases/.terraform.lock.hcl @@ -24,25 +24,25 @@ provider "registry.terraform.io/cyrilgdn/postgresql" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.67" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/rds-databases/_terraform.tf b/terraform/rds-databases/_terraform.tf index a1cb4edc1..15e211b82 100644 --- a/terraform/rds-databases/_terraform.tf +++ b/terraform/rds-databases/_terraform.tf @@ -6,11 +6,11 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.67" + version = "~> 5.64" } postgresql = { source = "cyrilgdn/postgresql" - version = "~> 1.14" + version = "~> 1.22" } random = { source = "hashicorp/random" From 5ae7fed464498ddef77c28980c59b09ed7702d26 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 23 Aug 2024 15:52:32 +0200 Subject: [PATCH 140/217] chore(dns-delegation): update AWS provider to version 5.64 --- terraform/dns-delegation/.terraform.lock.hcl | 35 ++++++++++---------- terraform/dns-delegation/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/terraform/dns-delegation/.terraform.lock.hcl b/terraform/dns-delegation/.terraform.lock.hcl index b6b44e72e..bbf28555f 100644 --- a/terraform/dns-delegation/.terraform.lock.hcl +++ b/terraform/dns-delegation/.terraform.lock.hcl @@ -2,25 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.48.0" - constraints = "~> 4.48" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:Fz26mWZmM9syrY91aPeTdd3hXG4DvMR81ylWC9xE2uA=", - "h1:t4+ZVZIg8DbyFTMy4sZcvb7FULMG3mpg9Woh/2IaQ+o=", - "zh:08f5e3c5256a4fbd5c988863d10e5279172b2470fec6d4fb13c372663e7f7cac", - "zh:2a04376b7fa84681bd2938973c7d0822c8c0f0656a4e7661a2f50ac4d852d4a3", - "zh:30d6cdf321aaba874934cbde505333d89d172d8d5ffcf40b6e66626c57bc6ab2", - "zh:364639ee19cf4cfaa65de84a2a71d32725d5b728b71dd88d01ccb639c006c1cf", - "zh:4e02252cd88b6f59f556f49c5ce46a358046c98f069230358ac15f4030ae1e76", - "zh:611717320f20b3512ceb90abddd5198a85e1093965ce59e3ef8183188c84f8c3", - "zh:630be3b9ba5b3a95ecb2ce2f3523714ab37cd8bcd7479c879a769e6a446ab5ed", - "zh:6701f9d3ae1ffadb3ebefbe75c9d82668cc5495b8f826e498adb8530e202b652", - "zh:6dc6fdfa7469c9de7b405c68b2f6a09a3438db1ef09d348e49c7ceff4300b01a", - "zh:84c8140d8af6965fa9cd80e52eb2ee3d273e3ab7762719a8d1af665c08fab748", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9b6b4f7d4cea37ba7a42a47d506115498858bcd6440ad97dfb214c13a688ba90", - "zh:a7f876af20f5c5dae8e333ec0dfc901e26aa801137e7df65fb365565637bbfe2", - "zh:ad107b8e11dd0609b856584ce70ae6621aa4f1f946da51f7c792f1259e3f9c27", - "zh:d5dc1683693a5fe2652952f50dbbeccd02716799c26c6d1a1378b226cf845e9b", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/dns-delegation/_terraform.tf b/terraform/dns-delegation/_terraform.tf index ad8843f26..6ca8bc0ce 100644 --- a/terraform/dns-delegation/_terraform.tf +++ b/terraform/dns-delegation/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.48" + version = "~> 5.64" } } From 7f1a03beb786ff889cb48c643a8992020bbd7855 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 08:18:51 +0200 Subject: [PATCH 141/217] chore: update bastion to aws 5.64 --- terraform/bastion/.terraform.lock.hcl | 34 +++++++++++++-------------- terraform/bastion/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/bastion/.terraform.lock.hcl b/terraform/bastion/.terraform.lock.hcl index 5c6d4f85c..73fde3201 100644 --- a/terraform/bastion/.terraform.lock.hcl +++ b/terraform/bastion/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.67" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/bastion/_terraform.tf b/terraform/bastion/_terraform.tf index 00b177561..37ccf3bf1 100644 --- a/terraform/bastion/_terraform.tf +++ b/terraform/bastion/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.67" + version = "~> 5.64" } dns = { source = "hashicorp/dns" From 3a20516b8413c7c70cbd893966c802f625df6528 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 10:27:02 +0200 Subject: [PATCH 142/217] chore: update `terraform/team-repo` providers --- terraform/team-repo/.terraform.lock.hcl | 34 ++++++++++++------------- terraform/team-repo/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/team-repo/.terraform.lock.hcl b/terraform/team-repo/.terraform.lock.hcl index e5e6f693c..d2a526dd7 100644 --- a/terraform/team-repo/.terraform.lock.hcl +++ b/terraform/team-repo/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = ">= 4.20.0, ~> 4.20, < 6.0.0" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/team-repo/_terraform.tf b/terraform/team-repo/_terraform.tf index 34d846c10..01f84a517 100644 --- a/terraform/team-repo/_terraform.tf +++ b/terraform/team-repo/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.64" } external = { source = "hashicorp/external" From fb122c1edff7497f72587dc8a3f6190f3917fc31 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 10:38:49 +0200 Subject: [PATCH 143/217] chore: update `terraform/playground` providers --- terraform/playground/.terraform.lock.hcl | 34 +++++++++---------- terraform/playground/_terraform.tf | 2 +- .../shared/modules/acm-certificate/main.tf | 5 +-- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/terraform/playground/.terraform.lock.hcl b/terraform/playground/.terraform.lock.hcl index c1fc0b909..d72f7bc03 100644 --- a/terraform/playground/.terraform.lock.hcl +++ b/terraform/playground/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20, ~> 4.28" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/playground/_terraform.tf b/terraform/playground/_terraform.tf index edbd0549a..1045e5ece 100644 --- a/terraform/playground/_terraform.tf +++ b/terraform/playground/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.28" + version = "~> 5.64" } } diff --git a/terraform/shared/modules/acm-certificate/main.tf b/terraform/shared/modules/acm-certificate/main.tf index fb8e7c420..1cdae6ba1 100644 --- a/terraform/shared/modules/acm-certificate/main.tf +++ b/terraform/shared/modules/acm-certificate/main.tf @@ -5,8 +5,9 @@ locals { terraform { required_providers { aws = { - source = "hashicorp/aws" - version = "~> 4.20" + source = "hashicorp/aws" + // Allow both 4.x and 5.x while we upgrade everything to 5.x. + version = ">= 4.20, < 6" } } } From 48be91d553ccc5d3dc17106607a2aef542517dd6 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 10:46:24 +0200 Subject: [PATCH 144/217] chore: update `terraform/dns` provider --- terraform/dns/.terraform.lock.hcl | 32 ++++++++++++++++--------------- terraform/dns/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/terraform/dns/.terraform.lock.hcl b/terraform/dns/.terraform.lock.hcl index 694646b8a..bbf28555f 100644 --- a/terraform/dns/.terraform.lock.hcl +++ b/terraform/dns/.terraform.lock.hcl @@ -2,22 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.28.0" - constraints = "~> 4.28" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:OsPtt0JGl70xbY2+V/ai0d+Jk2p7pvkW8h9IKhIr288=", - "h1:TXCUuuaf2q54C43bxSNiF9g+cxTr8zqEZem0pW15cjE=", - "zh:1d4806e50971d2cd565273cedf3206e38931677a6f546cf2b9fb140b52b80604", - "zh:3f076791002b8afa5ba2d2038f1e1db5956022327eb5242152723ed410ae4571", - "zh:40e5944a9df0d083dbd316bcc6ac9ceada5c00dab70c21897e62b68c4c936bc9", - "zh:68b78d0c1866aa0bcbbadb1cf51349c9af697f8789f5778b7e7e2912a9c4845d", - "zh:72d6e66136841c0e5ae264e03555cf59751ddae1b9784eafcb877c624332c70a", - "zh:902c8f89dc10d321b87c09270c27a31a42d4e74e4da1608e55b7f241cd010a62", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:bf54c9f55d420b4e1fe68db81a759c40b9f9747159dea3061212a1c9768dcdfd", - "zh:bfbe7e745c420a4ebd27ca35dfe5c2acc7cdd05092e1daf60f5ae29a1130d752", - "zh:d271a30b16f0861f020e423d120d1458cf1757e740e016ace22084c39dc13550", - "zh:f1e4672d1625fd1f1268d4b807cb90e28150d46fb2d0dd0836de65db29c8d5e6", - "zh:f5cee910b4db2da3c2a28dae9055cbca4273eb774c362bb7bb5bde04deff4557", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/dns/_terraform.tf b/terraform/dns/_terraform.tf index 19c5b5a03..653b4e662 100644 --- a/terraform/dns/_terraform.tf +++ b/terraform/dns/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.28" + version = "~> 5.64" } } From ac659cdc022c00bae70dd77c84e8e08f3515d26d Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 10:57:17 +0200 Subject: [PATCH 145/217] chore: update `crates-io-logs` providers --- .../crates-io-logs/.terraform.lock.hcl | 34 +++++++++---------- .../modules/crates-io-logs/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terragrunt/accounts/crates-io-staging/crates-io-logs/.terraform.lock.hcl b/terragrunt/accounts/crates-io-staging/crates-io-logs/.terraform.lock.hcl index a5470fdfc..bbf28555f 100644 --- a/terragrunt/accounts/crates-io-staging/crates-io-logs/.terraform.lock.hcl +++ b/terragrunt/accounts/crates-io-staging/crates-io-logs/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/modules/crates-io-logs/_terraform.tf b/terragrunt/modules/crates-io-logs/_terraform.tf index a4f0a52be..eed3f5b6c 100644 --- a/terragrunt/modules/crates-io-logs/_terraform.tf +++ b/terragrunt/modules/crates-io-logs/_terraform.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.32" + version = "~> 5.64" } } } From 388298c8a0d3d1d28e887461d1d994ef44226f7c Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 11:00:45 +0200 Subject: [PATCH 146/217] update crates-io-prod deployed ref --- .../crates-io-logs/.terraform.lock.hcl | 34 +++++++++---------- .../accounts/crates-io-prod/deployed-ref | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terragrunt/accounts/crates-io-prod/crates-io-logs/.terraform.lock.hcl b/terragrunt/accounts/crates-io-prod/crates-io-logs/.terraform.lock.hcl index a5470fdfc..bbf28555f 100644 --- a/terragrunt/accounts/crates-io-prod/crates-io-logs/.terraform.lock.hcl +++ b/terragrunt/accounts/crates-io-prod/crates-io-logs/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/crates-io-prod/deployed-ref b/terragrunt/accounts/crates-io-prod/deployed-ref index b7851db75..ff990b2ad 100644 --- a/terragrunt/accounts/crates-io-prod/deployed-ref +++ b/terragrunt/accounts/crates-io-prod/deployed-ref @@ -1 +1 @@ -850723e3b2060c7fb462acdd0c091aa4f52caa9d +ac659cdc022c00bae70dd77c84e8e08f3515d26d From 85122f530ed837cc0f8aa7c31e03b15cb1e3f015 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 15:17:00 +0200 Subject: [PATCH 147/217] chore: update fastly provider to 5.13 --- .../team-members-fastly/.terraform.lock.hcl | 34 +++++++++---------- terraform/team-members-fastly/_terraform.tf | 2 +- .../crates-io/.terraform.lock.hcl | 34 +++++++++---------- .../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 | 2 +- .../release-distribution/_terraform.tf | 2 +- 9 files changed, 73 insertions(+), 73 deletions(-) diff --git a/terraform/team-members-fastly/.terraform.lock.hcl b/terraform/team-members-fastly/.terraform.lock.hcl index 8ee7082fa..552e40475 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 = "5.11.0" - constraints = "5.11.0" + version = "5.13.0" + constraints = "5.13.0" hashes = [ - "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", + "h1:op/7hntTRkfZFIZ5xLNtLb7eBY155ywQIVSy56XCmBE=", + "zh:04f7405ee22a8ace546b90cc3a08d81f1a49dae8b1050500398d4b0244dcbc86", + "zh:0e0c48aca34a1fc7ed7382c8e85b5da770f63f3c9aa79bc2c3c55ed570f9d0ab", + "zh:302d2b9872ab8ffee2082291cc2cfec487633e22c7970b2c9d22268d6b5f7624", + "zh:346ea021dbe2c7128cddc2c9e01a95242b8bceeda20d9d1b00ae09ee90e3962b", + "zh:41fbe18f63154a6a1a46e1b1cc909bfe90f5bba7f5cfab0a80d15be7eceec4c3", + "zh:524c2a54282a92d0d7633bfd511427f6d9aa6b6a52b7d9f71cf5206dedab381e", + "zh:721fe08bfb1b85f8946aeba3bdb7e0de3d74fce94c8657d0086b153f58558d89", + "zh:9c627b3170a5505c73455e6c2a99d2ce4187e225130e12aececdc808357f8b66", + "zh:a61a62cec9612358b08ef1895277a37d4d4ec134972991fa414255ef95683dba", + "zh:bde1a51553c15d333140c2b77481ee668c4af8de93a968d869c02a736db460c4", + "zh:c2683862bd0e9633d3800503a71b3aab51ec8e3aac3f6ef6b71831efe81a2afd", + "zh:dff5ad3766432550974d2f0c24535c572fee5eeb0dce7befeaa97cb6ca3d8443", + "zh:ec3c56fc43344a07b0eef5158df6dd50e68bdcee1b03299bb2acd502d11582d5", + "zh:ec8d899cafd925d3492f00c6523c90599aebc43c1373ad4bd6c55f12d2376230", ] } diff --git a/terraform/team-members-fastly/_terraform.tf b/terraform/team-members-fastly/_terraform.tf index aac498455..ea62b3aef 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 = "5.11.0" + version = "5.13.0" } } 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 592e9595c..86ec126a8 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,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/fastly/fastly" { - version = "5.11.0" - constraints = "5.11.0" + version = "5.13.0" + constraints = "5.13.0" hashes = [ - "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", + "h1:op/7hntTRkfZFIZ5xLNtLb7eBY155ywQIVSy56XCmBE=", + "zh:04f7405ee22a8ace546b90cc3a08d81f1a49dae8b1050500398d4b0244dcbc86", + "zh:0e0c48aca34a1fc7ed7382c8e85b5da770f63f3c9aa79bc2c3c55ed570f9d0ab", + "zh:302d2b9872ab8ffee2082291cc2cfec487633e22c7970b2c9d22268d6b5f7624", + "zh:346ea021dbe2c7128cddc2c9e01a95242b8bceeda20d9d1b00ae09ee90e3962b", + "zh:41fbe18f63154a6a1a46e1b1cc909bfe90f5bba7f5cfab0a80d15be7eceec4c3", + "zh:524c2a54282a92d0d7633bfd511427f6d9aa6b6a52b7d9f71cf5206dedab381e", + "zh:721fe08bfb1b85f8946aeba3bdb7e0de3d74fce94c8657d0086b153f58558d89", + "zh:9c627b3170a5505c73455e6c2a99d2ce4187e225130e12aececdc808357f8b66", + "zh:a61a62cec9612358b08ef1895277a37d4d4ec134972991fa414255ef95683dba", + "zh:bde1a51553c15d333140c2b77481ee668c4af8de93a968d869c02a736db460c4", + "zh:c2683862bd0e9633d3800503a71b3aab51ec8e3aac3f6ef6b71831efe81a2afd", + "zh:dff5ad3766432550974d2f0c24535c572fee5eeb0dce7befeaa97cb6ca3d8443", + "zh:ec3c56fc43344a07b0eef5158df6dd50e68bdcee1b03299bb2acd502d11582d5", + "zh:ec8d899cafd925d3492f00c6523c90599aebc43c1373ad4bd6c55f12d2376230", ] } diff --git a/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl b/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl index 9e19962b1..335d3f7e7 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.11.0" - constraints = "5.11.0" + version = "5.13.0" + constraints = "5.13.0" hashes = [ - "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", + "h1:op/7hntTRkfZFIZ5xLNtLb7eBY155ywQIVSy56XCmBE=", + "zh:04f7405ee22a8ace546b90cc3a08d81f1a49dae8b1050500398d4b0244dcbc86", + "zh:0e0c48aca34a1fc7ed7382c8e85b5da770f63f3c9aa79bc2c3c55ed570f9d0ab", + "zh:302d2b9872ab8ffee2082291cc2cfec487633e22c7970b2c9d22268d6b5f7624", + "zh:346ea021dbe2c7128cddc2c9e01a95242b8bceeda20d9d1b00ae09ee90e3962b", + "zh:41fbe18f63154a6a1a46e1b1cc909bfe90f5bba7f5cfab0a80d15be7eceec4c3", + "zh:524c2a54282a92d0d7633bfd511427f6d9aa6b6a52b7d9f71cf5206dedab381e", + "zh:721fe08bfb1b85f8946aeba3bdb7e0de3d74fce94c8657d0086b153f58558d89", + "zh:9c627b3170a5505c73455e6c2a99d2ce4187e225130e12aececdc808357f8b66", + "zh:a61a62cec9612358b08ef1895277a37d4d4ec134972991fa414255ef95683dba", + "zh:bde1a51553c15d333140c2b77481ee668c4af8de93a968d869c02a736db460c4", + "zh:c2683862bd0e9633d3800503a71b3aab51ec8e3aac3f6ef6b71831efe81a2afd", + "zh:dff5ad3766432550974d2f0c24535c572fee5eeb0dce7befeaa97cb6ca3d8443", + "zh:ec3c56fc43344a07b0eef5158df6dd50e68bdcee1b03299bb2acd502d11582d5", + "zh:ec8d899cafd925d3492f00c6523c90599aebc43c1373ad4bd6c55f12d2376230", ] } 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 a9124f41e..fcf8a9e2c 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.11.0" - constraints = "5.11.0" + version = "5.13.0" + constraints = "5.13.0" hashes = [ - "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", + "h1:op/7hntTRkfZFIZ5xLNtLb7eBY155ywQIVSy56XCmBE=", + "zh:04f7405ee22a8ace546b90cc3a08d81f1a49dae8b1050500398d4b0244dcbc86", + "zh:0e0c48aca34a1fc7ed7382c8e85b5da770f63f3c9aa79bc2c3c55ed570f9d0ab", + "zh:302d2b9872ab8ffee2082291cc2cfec487633e22c7970b2c9d22268d6b5f7624", + "zh:346ea021dbe2c7128cddc2c9e01a95242b8bceeda20d9d1b00ae09ee90e3962b", + "zh:41fbe18f63154a6a1a46e1b1cc909bfe90f5bba7f5cfab0a80d15be7eceec4c3", + "zh:524c2a54282a92d0d7633bfd511427f6d9aa6b6a52b7d9f71cf5206dedab381e", + "zh:721fe08bfb1b85f8946aeba3bdb7e0de3d74fce94c8657d0086b153f58558d89", + "zh:9c627b3170a5505c73455e6c2a99d2ce4187e225130e12aececdc808357f8b66", + "zh:a61a62cec9612358b08ef1895277a37d4d4ec134972991fa414255ef95683dba", + "zh:bde1a51553c15d333140c2b77481ee668c4af8de93a968d869c02a736db460c4", + "zh:c2683862bd0e9633d3800503a71b3aab51ec8e3aac3f6ef6b71831efe81a2afd", + "zh:dff5ad3766432550974d2f0c24535c572fee5eeb0dce7befeaa97cb6ca3d8443", + "zh:ec3c56fc43344a07b0eef5158df6dd50e68bdcee1b03299bb2acd502d11582d5", + "zh:ec8d899cafd925d3492f00c6523c90599aebc43c1373ad4bd6c55f12d2376230", ] } diff --git a/terragrunt/modules/crates-io/_terraform.tf b/terragrunt/modules/crates-io/_terraform.tf index e015bebde..b8c3174d8 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.11.0" + version = "5.13.0" } } } diff --git a/terragrunt/modules/datadog-fastly/_terraform.tf b/terragrunt/modules/datadog-fastly/_terraform.tf index 008b99392..1343baa1e 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.11.0" + version = "5.13.0" } } } diff --git a/terragrunt/modules/fastly-tls-subscription/_terraform.tf b/terragrunt/modules/fastly-tls-subscription/_terraform.tf index fd5133cd2..47a456d13 100644 --- a/terragrunt/modules/fastly-tls-subscription/_terraform.tf +++ b/terragrunt/modules/fastly-tls-subscription/_terraform.tf @@ -8,7 +8,7 @@ terraform { } fastly = { source = "fastly/fastly" - version = "5.11.0" + version = "5.13.0" } } } diff --git a/terragrunt/modules/release-distribution/_terraform.tf b/terragrunt/modules/release-distribution/_terraform.tf index f135e837d..5e58ca315 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.11.0" + version = "5.13.0" } } } From 60a4cffff8f2a473311e2590f6420de1d3b1e12a Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 15:45:37 +0200 Subject: [PATCH 148/217] 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 592e9595c..86ec126a8 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.11.0" - constraints = "5.11.0" + version = "5.13.0" + constraints = "5.13.0" hashes = [ - "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", + "h1:op/7hntTRkfZFIZ5xLNtLb7eBY155ywQIVSy56XCmBE=", + "zh:04f7405ee22a8ace546b90cc3a08d81f1a49dae8b1050500398d4b0244dcbc86", + "zh:0e0c48aca34a1fc7ed7382c8e85b5da770f63f3c9aa79bc2c3c55ed570f9d0ab", + "zh:302d2b9872ab8ffee2082291cc2cfec487633e22c7970b2c9d22268d6b5f7624", + "zh:346ea021dbe2c7128cddc2c9e01a95242b8bceeda20d9d1b00ae09ee90e3962b", + "zh:41fbe18f63154a6a1a46e1b1cc909bfe90f5bba7f5cfab0a80d15be7eceec4c3", + "zh:524c2a54282a92d0d7633bfd511427f6d9aa6b6a52b7d9f71cf5206dedab381e", + "zh:721fe08bfb1b85f8946aeba3bdb7e0de3d74fce94c8657d0086b153f58558d89", + "zh:9c627b3170a5505c73455e6c2a99d2ce4187e225130e12aececdc808357f8b66", + "zh:a61a62cec9612358b08ef1895277a37d4d4ec134972991fa414255ef95683dba", + "zh:bde1a51553c15d333140c2b77481ee668c4af8de93a968d869c02a736db460c4", + "zh:c2683862bd0e9633d3800503a71b3aab51ec8e3aac3f6ef6b71831efe81a2afd", + "zh:dff5ad3766432550974d2f0c24535c572fee5eeb0dce7befeaa97cb6ca3d8443", + "zh:ec3c56fc43344a07b0eef5158df6dd50e68bdcee1b03299bb2acd502d11582d5", + "zh:ec8d899cafd925d3492f00c6523c90599aebc43c1373ad4bd6c55f12d2376230", ] } diff --git a/terragrunt/accounts/legacy/crates-io-prod/deployed-ref b/terragrunt/accounts/legacy/crates-io-prod/deployed-ref index a60a6da33..5047e66f7 100644 --- a/terragrunt/accounts/legacy/crates-io-prod/deployed-ref +++ b/terragrunt/accounts/legacy/crates-io-prod/deployed-ref @@ -1 +1 @@ -fe7f3b92fbe04cd9d36bf36992f653ce27c7e8c7 +85122f530ed837cc0f8aa7c31e03b15cb1e3f015 diff --git a/terragrunt/accounts/legacy/releases-prod/deployed-ref b/terragrunt/accounts/legacy/releases-prod/deployed-ref index 5e2e5211e..5047e66f7 100644 --- a/terragrunt/accounts/legacy/releases-prod/deployed-ref +++ b/terragrunt/accounts/legacy/releases-prod/deployed-ref @@ -1 +1 @@ -585e9aabc4a5387af5c7aaebd68b095c1fcf89af +85122f530ed837cc0f8aa7c31e03b15cb1e3f015 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 a9124f41e..fcf8a9e2c 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.11.0" - constraints = "5.11.0" + version = "5.13.0" + constraints = "5.13.0" hashes = [ - "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", + "h1:op/7hntTRkfZFIZ5xLNtLb7eBY155ywQIVSy56XCmBE=", + "zh:04f7405ee22a8ace546b90cc3a08d81f1a49dae8b1050500398d4b0244dcbc86", + "zh:0e0c48aca34a1fc7ed7382c8e85b5da770f63f3c9aa79bc2c3c55ed570f9d0ab", + "zh:302d2b9872ab8ffee2082291cc2cfec487633e22c7970b2c9d22268d6b5f7624", + "zh:346ea021dbe2c7128cddc2c9e01a95242b8bceeda20d9d1b00ae09ee90e3962b", + "zh:41fbe18f63154a6a1a46e1b1cc909bfe90f5bba7f5cfab0a80d15be7eceec4c3", + "zh:524c2a54282a92d0d7633bfd511427f6d9aa6b6a52b7d9f71cf5206dedab381e", + "zh:721fe08bfb1b85f8946aeba3bdb7e0de3d74fce94c8657d0086b153f58558d89", + "zh:9c627b3170a5505c73455e6c2a99d2ce4187e225130e12aececdc808357f8b66", + "zh:a61a62cec9612358b08ef1895277a37d4d4ec134972991fa414255ef95683dba", + "zh:bde1a51553c15d333140c2b77481ee668c4af8de93a968d869c02a736db460c4", + "zh:c2683862bd0e9633d3800503a71b3aab51ec8e3aac3f6ef6b71831efe81a2afd", + "zh:dff5ad3766432550974d2f0c24535c572fee5eeb0dce7befeaa97cb6ca3d8443", + "zh:ec3c56fc43344a07b0eef5158df6dd50e68bdcee1b03299bb2acd502d11582d5", + "zh:ec8d899cafd925d3492f00c6523c90599aebc43c1373ad4bd6c55f12d2376230", ] } From e8c05b4d53c887408e8cf2b5315d07112e3d695b Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:23:38 +0200 Subject: [PATCH 149/217] chore: update `terraform/docs-rs` aws provider to 5.64 --- terraform/docs-rs/.terraform.lock.hcl | 34 +++++++++++++-------------- terraform/docs-rs/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/docs-rs/.terraform.lock.hcl b/terraform/docs-rs/.terraform.lock.hcl index 759283e56..b8a50911c 100644 --- a/terraform/docs-rs/.terraform.lock.hcl +++ b/terraform/docs-rs/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20, ~> 4.32" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/docs-rs/_terraform.tf b/terraform/docs-rs/_terraform.tf index fa6d8dc3c..2a33c36a3 100644 --- a/terraform/docs-rs/_terraform.tf +++ b/terraform/docs-rs/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.32" + version = "~> 5.64" } random = { source = "hashicorp/random" From b2110959835b2cec89afc33b7f318a45ff8656ca Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:27:06 +0200 Subject: [PATCH 150/217] chore: update discord-mods-bot aws provider version to 5.64 --- .../discord-mods-bot/.terraform.lock.hcl | 34 +++++++++---------- terraform/discord-mods-bot/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/discord-mods-bot/.terraform.lock.hcl b/terraform/discord-mods-bot/.terraform.lock.hcl index e377b9efd..bbf28555f 100644 --- a/terraform/discord-mods-bot/.terraform.lock.hcl +++ b/terraform/discord-mods-bot/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.67" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/discord-mods-bot/_terraform.tf b/terraform/discord-mods-bot/_terraform.tf index 0f646d7d1..5d22d98b9 100644 --- a/terraform/discord-mods-bot/_terraform.tf +++ b/terraform/discord-mods-bot/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.67" + version = "~> 5.64" } } From e0d1c165e6db531c76a14dee0d128667c70f3c20 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:31:24 +0200 Subject: [PATCH 151/217] chore: update crates-io-heroku-metrics aws provider to 5.64 --- .../.terraform.lock.hcl | 34 +++++++++---------- .../crates-io-heroku-metrics/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/crates-io-heroku-metrics/.terraform.lock.hcl b/terraform/crates-io-heroku-metrics/.terraform.lock.hcl index 05bfd5ec0..f8eb0e7b0 100644 --- a/terraform/crates-io-heroku-metrics/.terraform.lock.hcl +++ b/terraform/crates-io-heroku-metrics/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/crates-io-heroku-metrics/_terraform.tf b/terraform/crates-io-heroku-metrics/_terraform.tf index f4d46333a..89c29a52c 100644 --- a/terraform/crates-io-heroku-metrics/_terraform.tf +++ b/terraform/crates-io-heroku-metrics/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.64" } github = { source = "integrations/github" From e815f127e33860dff11e1b4bdbbeb5aa64317374 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:35:58 +0200 Subject: [PATCH 152/217] chore: update `terraform/bors` to aws provider 5.64 --- terraform/bors/.terraform.lock.hcl | 34 +++++++++++++++--------------- terraform/bors/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/bors/.terraform.lock.hcl b/terraform/bors/.terraform.lock.hcl index d94444ccc..b8a50911c 100644 --- a/terraform/bors/.terraform.lock.hcl +++ b/terraform/bors/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/bors/_terraform.tf b/terraform/bors/_terraform.tf index 24a46889e..1d1cd63a2 100644 --- a/terraform/bors/_terraform.tf +++ b/terraform/bors/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.64" } github = { source = "integrations/github" From 8d0ce3a88bbfb666adfcf83a170bff929476c404 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:39:40 +0200 Subject: [PATCH 153/217] chore: update `terraform/monitorbot` to aws provider 5.64 --- terraform/monitorbot/.terraform.lock.hcl | 34 ++++++++++++------------ terraform/monitorbot/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/monitorbot/.terraform.lock.hcl b/terraform/monitorbot/.terraform.lock.hcl index d94444ccc..b8a50911c 100644 --- a/terraform/monitorbot/.terraform.lock.hcl +++ b/terraform/monitorbot/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/monitorbot/_terraform.tf b/terraform/monitorbot/_terraform.tf index 14e6f6433..1f3d2c552 100644 --- a/terraform/monitorbot/_terraform.tf +++ b/terraform/monitorbot/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.64" } github = { source = "integrations/github" From 9acd40685abc809ab246c494afb8ccb64239428f Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:44:40 +0200 Subject: [PATCH 154/217] chore: update `terraform/rust-log-analyzer` to aws provider 5.64 --- .../rust-log-analyzer/.terraform.lock.hcl | 34 +++++++++---------- terraform/rust-log-analyzer/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/rust-log-analyzer/.terraform.lock.hcl b/terraform/rust-log-analyzer/.terraform.lock.hcl index 05bfd5ec0..f8eb0e7b0 100644 --- a/terraform/rust-log-analyzer/.terraform.lock.hcl +++ b/terraform/rust-log-analyzer/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/rust-log-analyzer/_terraform.tf b/terraform/rust-log-analyzer/_terraform.tf index aeeeee499..a231dfebc 100644 --- a/terraform/rust-log-analyzer/_terraform.tf +++ b/terraform/rust-log-analyzer/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.64" } github = { source = "integrations/github" From 46e8e797a94b9f411a0ccb6778cb606a56568c8b Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:55:10 +0200 Subject: [PATCH 155/217] chore: update `terraform/fastly-exporter` to aws provider 5.64 --- terraform/fastly-exporter/.terraform.lock.hcl | 34 +++++++++---------- terraform/fastly-exporter/_terraform.tf | 5 ++- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/terraform/fastly-exporter/.terraform.lock.hcl b/terraform/fastly-exporter/.terraform.lock.hcl index 5bad66909..6a8362798 100644 --- a/terraform/fastly-exporter/.terraform.lock.hcl +++ b/terraform/fastly-exporter/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.57.1" - constraints = "~> 4.20, ~> 4.32" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:Qfq7Q9aCQqdl7w439mCMm89126n8DsDAmg6H8gXhnLI=", - "zh:44200c213ddb138df80d2a5ad86c2ebadbb5fd1d08cd7e4fc56ec6dca927659b", - "zh:469e6fe6a9e99e60cb168d32f05e2e9a83cf161f39160d075ff96f7674c510e1", - "zh:6110ba2c15a2268652ec9ea3797dd0216de84ece428055c49eaf9caa2be1ed62", - "zh:62ed7348acca44f64fc087e879e01cfa4e084c7600cc91e8bb7683f8065a9c79", - "zh:7a80e6fa9b35be178bb566093f7984dd6ffb7ad9d40b9dd5d5907f054f0c3e60", - "zh:8793043c8575a598c1a7cbefcb65ee1776b0061eba719098e552a3adc88f3090", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a777a0082114e273b7b3eb14095a3f6f6e703c1aff61ffb1f0846bb869e6dfc7", - "zh:b060c3b2973097f2087a98ac6aad7c9c89fe80f7cf3027019049feafc3f8305b", - "zh:e7035e74563f4486848ea1feb60852175353790bc374e0e97e241a88dc0908f7", - "zh:eaaa8e9eba09ada41e13116d53d4baece04fead8fcf3eab68cca3a67ed738e18", - "zh:ec52d8f95a84fad8fe1aae169c89d0c54d5401f75caae0869ad8182c6b6db65b", - "zh:f0e33174025b1b57ecfbdd09f2a59c2559ee94d7681e5ae09079e2822ec54ecf", - "zh:f69790a21380e5aab9303a252564737333e1e95b5d25567681630e49b17e3ec7", - "zh:ff6053942c40a99904bd407f3c082c1fa8f927ecce0374566eb7e8ee8145e582", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/fastly-exporter/_terraform.tf b/terraform/fastly-exporter/_terraform.tf index 6be9f4f07..ca1b48da5 100644 --- a/terraform/fastly-exporter/_terraform.tf +++ b/terraform/fastly-exporter/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.32" + version = "~> 5.64" } } @@ -29,6 +29,5 @@ data "terraform_remote_state" "shared" { } provider "aws" { - profile = "legacy" - region = "us-west-1" + region = "us-west-1" } From 6e29bbf1e248f4c80085ec3962f20c79ff8e655c Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 17:05:36 +0200 Subject: [PATCH 156/217] chore: update `terraform/rustc-ci` to aws provider 5.64 --- terraform/rustc-ci/.terraform.lock.hcl | 34 +++++++++---------- terraform/rustc-ci/_terraform.tf | 2 +- terraform/rustc-ci/impl/_terraform.tf | 2 +- .../shared/modules/static-website/main.tf | 5 +-- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/terraform/rustc-ci/.terraform.lock.hcl b/terraform/rustc-ci/.terraform.lock.hcl index ca7e6e62d..ce798dfac 100644 --- a/terraform/rustc-ci/.terraform.lock.hcl +++ b/terraform/rustc-ci/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20, ~> 4.28, ~> 4.67" + version = "5.64.0" + constraints = ">= 4.20.0, >= 4.28.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/rustc-ci/_terraform.tf b/terraform/rustc-ci/_terraform.tf index cded8a311..123680c35 100644 --- a/terraform/rustc-ci/_terraform.tf +++ b/terraform/rustc-ci/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.67" + version = "~> 5.64" } } diff --git a/terraform/rustc-ci/impl/_terraform.tf b/terraform/rustc-ci/impl/_terraform.tf index 8063a4388..cf4d55429 100644 --- a/terraform/rustc-ci/impl/_terraform.tf +++ b/terraform/rustc-ci/impl/_terraform.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.67" + version = "~> 5.64" configuration_aliases = [aws.east1] } } diff --git a/terraform/shared/modules/static-website/main.tf b/terraform/shared/modules/static-website/main.tf index 11f114ca1..fade82ad5 100644 --- a/terraform/shared/modules/static-website/main.tf +++ b/terraform/shared/modules/static-website/main.tf @@ -1,8 +1,9 @@ terraform { required_providers { aws = { - source = "hashicorp/aws" - version = "~> 4.28" + source = "hashicorp/aws" + // Allow both 4.x and 5.x while we upgrade everything to 5.x. + version = ">= 4.28, < 6" } } } From 64bfe26f242bfff842dbd160af33dcf7d193d5a7 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 17:10:17 +0200 Subject: [PATCH 157/217] chore: update `terraform/team-members-access` to aws provider 5.64 --- .../team-members-access/.terraform.lock.hcl | 34 +++++++++---------- terraform/team-members-access/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/team-members-access/.terraform.lock.hcl b/terraform/team-members-access/.terraform.lock.hcl index e377b9efd..bbf28555f 100644 --- a/terraform/team-members-access/.terraform.lock.hcl +++ b/terraform/team-members-access/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.67" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/team-members-access/_terraform.tf b/terraform/team-members-access/_terraform.tf index 5a97e49d0..17f610b28 100644 --- a/terraform/team-members-access/_terraform.tf +++ b/terraform/team-members-access/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.67" + version = "~> 5.64" } } From 44e7aad665fb188035cf15daf8ab156c21116801 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 26 Aug 2024 17:21:18 +0200 Subject: [PATCH 158/217] chore: upgrade datadog terraform provider --- .../team-members-datadog/.terraform.lock.hcl | 34 +++++++++---------- terraform/team-members-datadog/_terraform.tf | 2 +- .../bors-prod/datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../legacy/datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../legacy/datadog-fastly/.terraform.lock.hcl | 34 +++++++++---------- .../root/datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- terragrunt/modules/datadog-aws/_terraform.tf | 2 +- .../modules/datadog-fastly/_terraform.tf | 2 +- 14 files changed, 190 insertions(+), 190 deletions(-) diff --git a/terraform/team-members-datadog/.terraform.lock.hcl b/terraform/team-members-datadog/.terraform.lock.hcl index 33c9bfbcf..62171eff8 100644 --- a/terraform/team-members-datadog/.terraform.lock.hcl +++ b/terraform/team-members-datadog/.terraform.lock.hcl @@ -2,23 +2,23 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/datadog/datadog" { - version = "3.30.0" - constraints = "3.30.0" + version = "3.43.1" + constraints = "3.43.1" hashes = [ - "h1:oN61IZ1rl+rfzXw0UVVnmFZ/Ulk8bKBsALN6O+p5vqs=", - "zh:01fc43eae96ea3801d95f81e83f151e64ef91dc4b1aedd3ee857c073a891a05d", - "zh:169ca1d8ae0cbb613fa9a7039babffa0a9bc62200d5ac5a027e259b98d8df33e", - "zh:22d75dc6dd9fde39ca1b2b5ceac7026aed2ad801cf81a587dd93e25b94c56ca4", - "zh:4bccc0639a881d44be4e7e2868fe1e0dbc1f0a6ebad1e1e554808bc80979c02c", - "zh:6295eb99ff106e00da52dba699e0b7fcba8b4d0535eac26d61eb17ddde5c2c53", - "zh:68c7de436a0e33ae06e93a5e989445dcc944a102faaec7e9f84762688520bd3c", - "zh:7c3ab23ebe2269c9952a8e91ddc6b05889186c81bb472eed0fdd6cd730350d6f", - "zh:85508c9c377211bd44531824464bf81830badb47e02877b008fce5de02204639", - "zh:8bb6a27c39e7d81d5d8bae00a159aa6a9e665e365393e65602839268893da1cc", - "zh:97f542f3e33df80a245b9f85fb29582fd3598bca4be3ceafd8aa012ba15f88c2", - "zh:cc051226ba800ae5c73a219c775c4fd883203381a4baaa2b1e211545407e42f3", - "zh:cea8b53a4bba00b1c452af5bb5a16d46e56f9d04dacfbcf794397aea105e17c6", - "zh:d56c39142843e945a08b23da9b147817b9b67f8f293b6a8253cd932c095f61b4", - "zh:d7aa186ec0dff53ee776472c902685437d76abe31e9a6872d74c03f0ae25ff3b", + "h1:pcyAjQvw5BUajiVGJQ6nVWdocfSnCRdazHwTzjdOh3M=", + "zh:115a656d68c9ac95188a3421dd8aa5a9ba4074d42b717fcc87ffd45576231857", + "zh:1dc3687237d8c2c947ebd5a3c80404c17dbf210cfb7f3b4464fd6e12f6784398", + "zh:24dc4d31edd69977bdf6004d85092d7013f6f7917c24ecb758717962dd7cbfe5", + "zh:2e5def7d74f488070443f86d75fb9813736c085efb5fa1f7e0f6151a2f83a30b", + "zh:6e4502bbd54b0a782b582c4d22aaa43814eae6a0b66f4835648c27f6015d505d", + "zh:8105124f33fa84fd59af3a18ab8534ce7f956c2e8a9d26546adfdbc9e8d7c725", + "zh:8ac9fc28cb06326c51ee2a35ee092e0abbaa2545a72f3318c406e9e5f0ef22a1", + "zh:a17997d6e2aafd488af6fcede3d20acfe72d5d6f0c1d257880657da1eb0a175e", + "zh:b35ea09714425c17578b6473c362380bb9b276d3f8bfff675d1ee7deb11377a7", + "zh:b71dfa4bde00632c0ebc9531274f337891303cf2e647b479d5030c22b33347ba", + "zh:ba51ddc2dc8c8e72426e873b2e3abac0ebfb9724207ba135bb3aa4775a523429", + "zh:bb5631c8c209fc94434164acd7478726f1f8ef40089e68eff12d131a648961bf", + "zh:c165ae439b26834858139fe971b702e5baad74db22b6439784b37690d087ffca", + "zh:d185755f6a0d4783fb42121109eeec4207f9caf35e7066bdf1101d12ae2c2ec8", ] } diff --git a/terraform/team-members-datadog/_terraform.tf b/terraform/team-members-datadog/_terraform.tf index 4e7036be4..4d7184f61 100644 --- a/terraform/team-members-datadog/_terraform.tf +++ b/terraform/team-members-datadog/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { datadog = { source = "datadog/datadog" - version = "3.30.0" + version = "3.43.1" } } diff --git a/terragrunt/accounts/bors-prod/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/bors-prod/datadog-aws/.terraform.lock.hcl index 1520260f0..4cb9fe0ca 100644 --- a/terragrunt/accounts/bors-prod/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-prod/datadog-aws/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/datadog/datadog" { - version = "3.28.0" - constraints = "3.28.0" + version = "3.43.1" + constraints = "3.43.1" hashes = [ - "h1:U2XC52fG1dIau+BFD3fNK84AzDrB7quUFVTsa1aSl28=", - "zh:0246fe3dac4a271015db05a9a642a79f089f2c618811e2f62cf43d883d14226e", - "zh:2ed049e51ac35ff2ee49f34873239f2dd31f69fac9462b6f995c48740951a0f9", - "zh:30871283e594f1288ba91fa637ea40c9a63846b83a8dd0d4b332d5f2fa43b63f", - "zh:46e81c2aa9e3c0586eaace027cd3612ba0b010a924af6d0db33d715f0e074c28", - "zh:68547e2994c81fc91712a36d70b76e850e98d5b7a71e0cd21cf1e9b47b783eed", - "zh:6a3930340e3b2c732fe112aa312b6854c0dbd37cabf3b4873672be56bdc8e9c3", - "zh:7660d83d137600b7a01113ba8ed8fdeaf2ca4236a093173e75cef6efaea1b934", - "zh:8752e3e02003dd7ec49f47eb3f60b287e9bbfd5034bb06384901a4c69f1f9287", - "zh:9be1fb6a1d012cdda0c8a7954c8caf73b4b10ec2a926e502a323e1e77f31027a", - "zh:b4c066acae2a13b0d1e3a875921fc88caebeca76c9d4b9d0f88b88f4ec8d6c71", - "zh:bfd7dca405407c561258a636e7abdda5cf8a6a324353aae64aff6ee624ae59a3", - "zh:d8c980a3c7732284a5c0c0b9a22c9432ca344f9b4f94af5df84dfe8ce12036bc", - "zh:e4045b7d34f62f676cadcc237c72a12bb1e82d5ce7748c730dd1b82064f12474", - "zh:eb9e52d91cb069a30b310b7bfd305862e4a8f86d09d1b9d44ea8cd199a7571ae", + "h1:pcyAjQvw5BUajiVGJQ6nVWdocfSnCRdazHwTzjdOh3M=", + "zh:115a656d68c9ac95188a3421dd8aa5a9ba4074d42b717fcc87ffd45576231857", + "zh:1dc3687237d8c2c947ebd5a3c80404c17dbf210cfb7f3b4464fd6e12f6784398", + "zh:24dc4d31edd69977bdf6004d85092d7013f6f7917c24ecb758717962dd7cbfe5", + "zh:2e5def7d74f488070443f86d75fb9813736c085efb5fa1f7e0f6151a2f83a30b", + "zh:6e4502bbd54b0a782b582c4d22aaa43814eae6a0b66f4835648c27f6015d505d", + "zh:8105124f33fa84fd59af3a18ab8534ce7f956c2e8a9d26546adfdbc9e8d7c725", + "zh:8ac9fc28cb06326c51ee2a35ee092e0abbaa2545a72f3318c406e9e5f0ef22a1", + "zh:a17997d6e2aafd488af6fcede3d20acfe72d5d6f0c1d257880657da1eb0a175e", + "zh:b35ea09714425c17578b6473c362380bb9b276d3f8bfff675d1ee7deb11377a7", + "zh:b71dfa4bde00632c0ebc9531274f337891303cf2e647b479d5030c22b33347ba", + "zh:ba51ddc2dc8c8e72426e873b2e3abac0ebfb9724207ba135bb3aa4775a523429", + "zh:bb5631c8c209fc94434164acd7478726f1f8ef40089e68eff12d131a648961bf", + "zh:c165ae439b26834858139fe971b702e5baad74db22b6439784b37690d087ffca", + "zh:d185755f6a0d4783fb42121109eeec4207f9caf35e7066bdf1101d12ae2c2ec8", ] } diff --git a/terragrunt/accounts/bors-staging/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/bors-staging/datadog-aws/.terraform.lock.hcl index 1520260f0..4cb9fe0ca 100644 --- a/terragrunt/accounts/bors-staging/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-staging/datadog-aws/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/datadog/datadog" { - version = "3.28.0" - constraints = "3.28.0" + version = "3.43.1" + constraints = "3.43.1" hashes = [ - "h1:U2XC52fG1dIau+BFD3fNK84AzDrB7quUFVTsa1aSl28=", - "zh:0246fe3dac4a271015db05a9a642a79f089f2c618811e2f62cf43d883d14226e", - "zh:2ed049e51ac35ff2ee49f34873239f2dd31f69fac9462b6f995c48740951a0f9", - "zh:30871283e594f1288ba91fa637ea40c9a63846b83a8dd0d4b332d5f2fa43b63f", - "zh:46e81c2aa9e3c0586eaace027cd3612ba0b010a924af6d0db33d715f0e074c28", - "zh:68547e2994c81fc91712a36d70b76e850e98d5b7a71e0cd21cf1e9b47b783eed", - "zh:6a3930340e3b2c732fe112aa312b6854c0dbd37cabf3b4873672be56bdc8e9c3", - "zh:7660d83d137600b7a01113ba8ed8fdeaf2ca4236a093173e75cef6efaea1b934", - "zh:8752e3e02003dd7ec49f47eb3f60b287e9bbfd5034bb06384901a4c69f1f9287", - "zh:9be1fb6a1d012cdda0c8a7954c8caf73b4b10ec2a926e502a323e1e77f31027a", - "zh:b4c066acae2a13b0d1e3a875921fc88caebeca76c9d4b9d0f88b88f4ec8d6c71", - "zh:bfd7dca405407c561258a636e7abdda5cf8a6a324353aae64aff6ee624ae59a3", - "zh:d8c980a3c7732284a5c0c0b9a22c9432ca344f9b4f94af5df84dfe8ce12036bc", - "zh:e4045b7d34f62f676cadcc237c72a12bb1e82d5ce7748c730dd1b82064f12474", - "zh:eb9e52d91cb069a30b310b7bfd305862e4a8f86d09d1b9d44ea8cd199a7571ae", + "h1:pcyAjQvw5BUajiVGJQ6nVWdocfSnCRdazHwTzjdOh3M=", + "zh:115a656d68c9ac95188a3421dd8aa5a9ba4074d42b717fcc87ffd45576231857", + "zh:1dc3687237d8c2c947ebd5a3c80404c17dbf210cfb7f3b4464fd6e12f6784398", + "zh:24dc4d31edd69977bdf6004d85092d7013f6f7917c24ecb758717962dd7cbfe5", + "zh:2e5def7d74f488070443f86d75fb9813736c085efb5fa1f7e0f6151a2f83a30b", + "zh:6e4502bbd54b0a782b582c4d22aaa43814eae6a0b66f4835648c27f6015d505d", + "zh:8105124f33fa84fd59af3a18ab8534ce7f956c2e8a9d26546adfdbc9e8d7c725", + "zh:8ac9fc28cb06326c51ee2a35ee092e0abbaa2545a72f3318c406e9e5f0ef22a1", + "zh:a17997d6e2aafd488af6fcede3d20acfe72d5d6f0c1d257880657da1eb0a175e", + "zh:b35ea09714425c17578b6473c362380bb9b276d3f8bfff675d1ee7deb11377a7", + "zh:b71dfa4bde00632c0ebc9531274f337891303cf2e647b479d5030c22b33347ba", + "zh:ba51ddc2dc8c8e72426e873b2e3abac0ebfb9724207ba135bb3aa4775a523429", + "zh:bb5631c8c209fc94434164acd7478726f1f8ef40089e68eff12d131a648961bf", + "zh:c165ae439b26834858139fe971b702e5baad74db22b6439784b37690d087ffca", + "zh:d185755f6a0d4783fb42121109eeec4207f9caf35e7066bdf1101d12ae2c2ec8", ] } diff --git a/terragrunt/accounts/crates-io-prod/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/crates-io-prod/datadog-aws/.terraform.lock.hcl index 1520260f0..4cb9fe0ca 100644 --- a/terragrunt/accounts/crates-io-prod/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/crates-io-prod/datadog-aws/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/datadog/datadog" { - version = "3.28.0" - constraints = "3.28.0" + version = "3.43.1" + constraints = "3.43.1" hashes = [ - "h1:U2XC52fG1dIau+BFD3fNK84AzDrB7quUFVTsa1aSl28=", - "zh:0246fe3dac4a271015db05a9a642a79f089f2c618811e2f62cf43d883d14226e", - "zh:2ed049e51ac35ff2ee49f34873239f2dd31f69fac9462b6f995c48740951a0f9", - "zh:30871283e594f1288ba91fa637ea40c9a63846b83a8dd0d4b332d5f2fa43b63f", - "zh:46e81c2aa9e3c0586eaace027cd3612ba0b010a924af6d0db33d715f0e074c28", - "zh:68547e2994c81fc91712a36d70b76e850e98d5b7a71e0cd21cf1e9b47b783eed", - "zh:6a3930340e3b2c732fe112aa312b6854c0dbd37cabf3b4873672be56bdc8e9c3", - "zh:7660d83d137600b7a01113ba8ed8fdeaf2ca4236a093173e75cef6efaea1b934", - "zh:8752e3e02003dd7ec49f47eb3f60b287e9bbfd5034bb06384901a4c69f1f9287", - "zh:9be1fb6a1d012cdda0c8a7954c8caf73b4b10ec2a926e502a323e1e77f31027a", - "zh:b4c066acae2a13b0d1e3a875921fc88caebeca76c9d4b9d0f88b88f4ec8d6c71", - "zh:bfd7dca405407c561258a636e7abdda5cf8a6a324353aae64aff6ee624ae59a3", - "zh:d8c980a3c7732284a5c0c0b9a22c9432ca344f9b4f94af5df84dfe8ce12036bc", - "zh:e4045b7d34f62f676cadcc237c72a12bb1e82d5ce7748c730dd1b82064f12474", - "zh:eb9e52d91cb069a30b310b7bfd305862e4a8f86d09d1b9d44ea8cd199a7571ae", + "h1:pcyAjQvw5BUajiVGJQ6nVWdocfSnCRdazHwTzjdOh3M=", + "zh:115a656d68c9ac95188a3421dd8aa5a9ba4074d42b717fcc87ffd45576231857", + "zh:1dc3687237d8c2c947ebd5a3c80404c17dbf210cfb7f3b4464fd6e12f6784398", + "zh:24dc4d31edd69977bdf6004d85092d7013f6f7917c24ecb758717962dd7cbfe5", + "zh:2e5def7d74f488070443f86d75fb9813736c085efb5fa1f7e0f6151a2f83a30b", + "zh:6e4502bbd54b0a782b582c4d22aaa43814eae6a0b66f4835648c27f6015d505d", + "zh:8105124f33fa84fd59af3a18ab8534ce7f956c2e8a9d26546adfdbc9e8d7c725", + "zh:8ac9fc28cb06326c51ee2a35ee092e0abbaa2545a72f3318c406e9e5f0ef22a1", + "zh:a17997d6e2aafd488af6fcede3d20acfe72d5d6f0c1d257880657da1eb0a175e", + "zh:b35ea09714425c17578b6473c362380bb9b276d3f8bfff675d1ee7deb11377a7", + "zh:b71dfa4bde00632c0ebc9531274f337891303cf2e647b479d5030c22b33347ba", + "zh:ba51ddc2dc8c8e72426e873b2e3abac0ebfb9724207ba135bb3aa4775a523429", + "zh:bb5631c8c209fc94434164acd7478726f1f8ef40089e68eff12d131a648961bf", + "zh:c165ae439b26834858139fe971b702e5baad74db22b6439784b37690d087ffca", + "zh:d185755f6a0d4783fb42121109eeec4207f9caf35e7066bdf1101d12ae2c2ec8", ] } diff --git a/terragrunt/accounts/crates-io-staging/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/crates-io-staging/datadog-aws/.terraform.lock.hcl index 1520260f0..4cb9fe0ca 100644 --- a/terragrunt/accounts/crates-io-staging/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/crates-io-staging/datadog-aws/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/datadog/datadog" { - version = "3.28.0" - constraints = "3.28.0" + version = "3.43.1" + constraints = "3.43.1" hashes = [ - "h1:U2XC52fG1dIau+BFD3fNK84AzDrB7quUFVTsa1aSl28=", - "zh:0246fe3dac4a271015db05a9a642a79f089f2c618811e2f62cf43d883d14226e", - "zh:2ed049e51ac35ff2ee49f34873239f2dd31f69fac9462b6f995c48740951a0f9", - "zh:30871283e594f1288ba91fa637ea40c9a63846b83a8dd0d4b332d5f2fa43b63f", - "zh:46e81c2aa9e3c0586eaace027cd3612ba0b010a924af6d0db33d715f0e074c28", - "zh:68547e2994c81fc91712a36d70b76e850e98d5b7a71e0cd21cf1e9b47b783eed", - "zh:6a3930340e3b2c732fe112aa312b6854c0dbd37cabf3b4873672be56bdc8e9c3", - "zh:7660d83d137600b7a01113ba8ed8fdeaf2ca4236a093173e75cef6efaea1b934", - "zh:8752e3e02003dd7ec49f47eb3f60b287e9bbfd5034bb06384901a4c69f1f9287", - "zh:9be1fb6a1d012cdda0c8a7954c8caf73b4b10ec2a926e502a323e1e77f31027a", - "zh:b4c066acae2a13b0d1e3a875921fc88caebeca76c9d4b9d0f88b88f4ec8d6c71", - "zh:bfd7dca405407c561258a636e7abdda5cf8a6a324353aae64aff6ee624ae59a3", - "zh:d8c980a3c7732284a5c0c0b9a22c9432ca344f9b4f94af5df84dfe8ce12036bc", - "zh:e4045b7d34f62f676cadcc237c72a12bb1e82d5ce7748c730dd1b82064f12474", - "zh:eb9e52d91cb069a30b310b7bfd305862e4a8f86d09d1b9d44ea8cd199a7571ae", + "h1:pcyAjQvw5BUajiVGJQ6nVWdocfSnCRdazHwTzjdOh3M=", + "zh:115a656d68c9ac95188a3421dd8aa5a9ba4074d42b717fcc87ffd45576231857", + "zh:1dc3687237d8c2c947ebd5a3c80404c17dbf210cfb7f3b4464fd6e12f6784398", + "zh:24dc4d31edd69977bdf6004d85092d7013f6f7917c24ecb758717962dd7cbfe5", + "zh:2e5def7d74f488070443f86d75fb9813736c085efb5fa1f7e0f6151a2f83a30b", + "zh:6e4502bbd54b0a782b582c4d22aaa43814eae6a0b66f4835648c27f6015d505d", + "zh:8105124f33fa84fd59af3a18ab8534ce7f956c2e8a9d26546adfdbc9e8d7c725", + "zh:8ac9fc28cb06326c51ee2a35ee092e0abbaa2545a72f3318c406e9e5f0ef22a1", + "zh:a17997d6e2aafd488af6fcede3d20acfe72d5d6f0c1d257880657da1eb0a175e", + "zh:b35ea09714425c17578b6473c362380bb9b276d3f8bfff675d1ee7deb11377a7", + "zh:b71dfa4bde00632c0ebc9531274f337891303cf2e647b479d5030c22b33347ba", + "zh:ba51ddc2dc8c8e72426e873b2e3abac0ebfb9724207ba135bb3aa4775a523429", + "zh:bb5631c8c209fc94434164acd7478726f1f8ef40089e68eff12d131a648961bf", + "zh:c165ae439b26834858139fe971b702e5baad74db22b6439784b37690d087ffca", + "zh:d185755f6a0d4783fb42121109eeec4207f9caf35e7066bdf1101d12ae2c2ec8", ] } diff --git a/terragrunt/accounts/dev-desktops-prod/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/datadog-aws/.terraform.lock.hcl index 1520260f0..4cb9fe0ca 100644 --- a/terragrunt/accounts/dev-desktops-prod/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/datadog-aws/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/datadog/datadog" { - version = "3.28.0" - constraints = "3.28.0" + version = "3.43.1" + constraints = "3.43.1" hashes = [ - "h1:U2XC52fG1dIau+BFD3fNK84AzDrB7quUFVTsa1aSl28=", - "zh:0246fe3dac4a271015db05a9a642a79f089f2c618811e2f62cf43d883d14226e", - "zh:2ed049e51ac35ff2ee49f34873239f2dd31f69fac9462b6f995c48740951a0f9", - "zh:30871283e594f1288ba91fa637ea40c9a63846b83a8dd0d4b332d5f2fa43b63f", - "zh:46e81c2aa9e3c0586eaace027cd3612ba0b010a924af6d0db33d715f0e074c28", - "zh:68547e2994c81fc91712a36d70b76e850e98d5b7a71e0cd21cf1e9b47b783eed", - "zh:6a3930340e3b2c732fe112aa312b6854c0dbd37cabf3b4873672be56bdc8e9c3", - "zh:7660d83d137600b7a01113ba8ed8fdeaf2ca4236a093173e75cef6efaea1b934", - "zh:8752e3e02003dd7ec49f47eb3f60b287e9bbfd5034bb06384901a4c69f1f9287", - "zh:9be1fb6a1d012cdda0c8a7954c8caf73b4b10ec2a926e502a323e1e77f31027a", - "zh:b4c066acae2a13b0d1e3a875921fc88caebeca76c9d4b9d0f88b88f4ec8d6c71", - "zh:bfd7dca405407c561258a636e7abdda5cf8a6a324353aae64aff6ee624ae59a3", - "zh:d8c980a3c7732284a5c0c0b9a22c9432ca344f9b4f94af5df84dfe8ce12036bc", - "zh:e4045b7d34f62f676cadcc237c72a12bb1e82d5ce7748c730dd1b82064f12474", - "zh:eb9e52d91cb069a30b310b7bfd305862e4a8f86d09d1b9d44ea8cd199a7571ae", + "h1:pcyAjQvw5BUajiVGJQ6nVWdocfSnCRdazHwTzjdOh3M=", + "zh:115a656d68c9ac95188a3421dd8aa5a9ba4074d42b717fcc87ffd45576231857", + "zh:1dc3687237d8c2c947ebd5a3c80404c17dbf210cfb7f3b4464fd6e12f6784398", + "zh:24dc4d31edd69977bdf6004d85092d7013f6f7917c24ecb758717962dd7cbfe5", + "zh:2e5def7d74f488070443f86d75fb9813736c085efb5fa1f7e0f6151a2f83a30b", + "zh:6e4502bbd54b0a782b582c4d22aaa43814eae6a0b66f4835648c27f6015d505d", + "zh:8105124f33fa84fd59af3a18ab8534ce7f956c2e8a9d26546adfdbc9e8d7c725", + "zh:8ac9fc28cb06326c51ee2a35ee092e0abbaa2545a72f3318c406e9e5f0ef22a1", + "zh:a17997d6e2aafd488af6fcede3d20acfe72d5d6f0c1d257880657da1eb0a175e", + "zh:b35ea09714425c17578b6473c362380bb9b276d3f8bfff675d1ee7deb11377a7", + "zh:b71dfa4bde00632c0ebc9531274f337891303cf2e647b479d5030c22b33347ba", + "zh:ba51ddc2dc8c8e72426e873b2e3abac0ebfb9724207ba135bb3aa4775a523429", + "zh:bb5631c8c209fc94434164acd7478726f1f8ef40089e68eff12d131a648961bf", + "zh:c165ae439b26834858139fe971b702e5baad74db22b6439784b37690d087ffca", + "zh:d185755f6a0d4783fb42121109eeec4207f9caf35e7066bdf1101d12ae2c2ec8", ] } diff --git a/terragrunt/accounts/docs-rs-staging/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/docs-rs-staging/datadog-aws/.terraform.lock.hcl index 1520260f0..4cb9fe0ca 100644 --- a/terragrunt/accounts/docs-rs-staging/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/docs-rs-staging/datadog-aws/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/datadog/datadog" { - version = "3.28.0" - constraints = "3.28.0" + version = "3.43.1" + constraints = "3.43.1" hashes = [ - "h1:U2XC52fG1dIau+BFD3fNK84AzDrB7quUFVTsa1aSl28=", - "zh:0246fe3dac4a271015db05a9a642a79f089f2c618811e2f62cf43d883d14226e", - "zh:2ed049e51ac35ff2ee49f34873239f2dd31f69fac9462b6f995c48740951a0f9", - "zh:30871283e594f1288ba91fa637ea40c9a63846b83a8dd0d4b332d5f2fa43b63f", - "zh:46e81c2aa9e3c0586eaace027cd3612ba0b010a924af6d0db33d715f0e074c28", - "zh:68547e2994c81fc91712a36d70b76e850e98d5b7a71e0cd21cf1e9b47b783eed", - "zh:6a3930340e3b2c732fe112aa312b6854c0dbd37cabf3b4873672be56bdc8e9c3", - "zh:7660d83d137600b7a01113ba8ed8fdeaf2ca4236a093173e75cef6efaea1b934", - "zh:8752e3e02003dd7ec49f47eb3f60b287e9bbfd5034bb06384901a4c69f1f9287", - "zh:9be1fb6a1d012cdda0c8a7954c8caf73b4b10ec2a926e502a323e1e77f31027a", - "zh:b4c066acae2a13b0d1e3a875921fc88caebeca76c9d4b9d0f88b88f4ec8d6c71", - "zh:bfd7dca405407c561258a636e7abdda5cf8a6a324353aae64aff6ee624ae59a3", - "zh:d8c980a3c7732284a5c0c0b9a22c9432ca344f9b4f94af5df84dfe8ce12036bc", - "zh:e4045b7d34f62f676cadcc237c72a12bb1e82d5ce7748c730dd1b82064f12474", - "zh:eb9e52d91cb069a30b310b7bfd305862e4a8f86d09d1b9d44ea8cd199a7571ae", + "h1:pcyAjQvw5BUajiVGJQ6nVWdocfSnCRdazHwTzjdOh3M=", + "zh:115a656d68c9ac95188a3421dd8aa5a9ba4074d42b717fcc87ffd45576231857", + "zh:1dc3687237d8c2c947ebd5a3c80404c17dbf210cfb7f3b4464fd6e12f6784398", + "zh:24dc4d31edd69977bdf6004d85092d7013f6f7917c24ecb758717962dd7cbfe5", + "zh:2e5def7d74f488070443f86d75fb9813736c085efb5fa1f7e0f6151a2f83a30b", + "zh:6e4502bbd54b0a782b582c4d22aaa43814eae6a0b66f4835648c27f6015d505d", + "zh:8105124f33fa84fd59af3a18ab8534ce7f956c2e8a9d26546adfdbc9e8d7c725", + "zh:8ac9fc28cb06326c51ee2a35ee092e0abbaa2545a72f3318c406e9e5f0ef22a1", + "zh:a17997d6e2aafd488af6fcede3d20acfe72d5d6f0c1d257880657da1eb0a175e", + "zh:b35ea09714425c17578b6473c362380bb9b276d3f8bfff675d1ee7deb11377a7", + "zh:b71dfa4bde00632c0ebc9531274f337891303cf2e647b479d5030c22b33347ba", + "zh:ba51ddc2dc8c8e72426e873b2e3abac0ebfb9724207ba135bb3aa4775a523429", + "zh:bb5631c8c209fc94434164acd7478726f1f8ef40089e68eff12d131a648961bf", + "zh:c165ae439b26834858139fe971b702e5baad74db22b6439784b37690d087ffca", + "zh:d185755f6a0d4783fb42121109eeec4207f9caf35e7066bdf1101d12ae2c2ec8", ] } diff --git a/terragrunt/accounts/legacy/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/legacy/datadog-aws/.terraform.lock.hcl index 1520260f0..4cb9fe0ca 100644 --- a/terragrunt/accounts/legacy/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/datadog-aws/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/datadog/datadog" { - version = "3.28.0" - constraints = "3.28.0" + version = "3.43.1" + constraints = "3.43.1" hashes = [ - "h1:U2XC52fG1dIau+BFD3fNK84AzDrB7quUFVTsa1aSl28=", - "zh:0246fe3dac4a271015db05a9a642a79f089f2c618811e2f62cf43d883d14226e", - "zh:2ed049e51ac35ff2ee49f34873239f2dd31f69fac9462b6f995c48740951a0f9", - "zh:30871283e594f1288ba91fa637ea40c9a63846b83a8dd0d4b332d5f2fa43b63f", - "zh:46e81c2aa9e3c0586eaace027cd3612ba0b010a924af6d0db33d715f0e074c28", - "zh:68547e2994c81fc91712a36d70b76e850e98d5b7a71e0cd21cf1e9b47b783eed", - "zh:6a3930340e3b2c732fe112aa312b6854c0dbd37cabf3b4873672be56bdc8e9c3", - "zh:7660d83d137600b7a01113ba8ed8fdeaf2ca4236a093173e75cef6efaea1b934", - "zh:8752e3e02003dd7ec49f47eb3f60b287e9bbfd5034bb06384901a4c69f1f9287", - "zh:9be1fb6a1d012cdda0c8a7954c8caf73b4b10ec2a926e502a323e1e77f31027a", - "zh:b4c066acae2a13b0d1e3a875921fc88caebeca76c9d4b9d0f88b88f4ec8d6c71", - "zh:bfd7dca405407c561258a636e7abdda5cf8a6a324353aae64aff6ee624ae59a3", - "zh:d8c980a3c7732284a5c0c0b9a22c9432ca344f9b4f94af5df84dfe8ce12036bc", - "zh:e4045b7d34f62f676cadcc237c72a12bb1e82d5ce7748c730dd1b82064f12474", - "zh:eb9e52d91cb069a30b310b7bfd305862e4a8f86d09d1b9d44ea8cd199a7571ae", + "h1:pcyAjQvw5BUajiVGJQ6nVWdocfSnCRdazHwTzjdOh3M=", + "zh:115a656d68c9ac95188a3421dd8aa5a9ba4074d42b717fcc87ffd45576231857", + "zh:1dc3687237d8c2c947ebd5a3c80404c17dbf210cfb7f3b4464fd6e12f6784398", + "zh:24dc4d31edd69977bdf6004d85092d7013f6f7917c24ecb758717962dd7cbfe5", + "zh:2e5def7d74f488070443f86d75fb9813736c085efb5fa1f7e0f6151a2f83a30b", + "zh:6e4502bbd54b0a782b582c4d22aaa43814eae6a0b66f4835648c27f6015d505d", + "zh:8105124f33fa84fd59af3a18ab8534ce7f956c2e8a9d26546adfdbc9e8d7c725", + "zh:8ac9fc28cb06326c51ee2a35ee092e0abbaa2545a72f3318c406e9e5f0ef22a1", + "zh:a17997d6e2aafd488af6fcede3d20acfe72d5d6f0c1d257880657da1eb0a175e", + "zh:b35ea09714425c17578b6473c362380bb9b276d3f8bfff675d1ee7deb11377a7", + "zh:b71dfa4bde00632c0ebc9531274f337891303cf2e647b479d5030c22b33347ba", + "zh:ba51ddc2dc8c8e72426e873b2e3abac0ebfb9724207ba135bb3aa4775a523429", + "zh:bb5631c8c209fc94434164acd7478726f1f8ef40089e68eff12d131a648961bf", + "zh:c165ae439b26834858139fe971b702e5baad74db22b6439784b37690d087ffca", + "zh:d185755f6a0d4783fb42121109eeec4207f9caf35e7066bdf1101d12ae2c2ec8", ] } diff --git a/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl b/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl index 335d3f7e7..5ff860f09 100644 --- a/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/datadog/datadog" { - version = "3.28.0" - constraints = "3.28.0" + version = "3.43.1" + constraints = "3.43.1" hashes = [ - "h1:U2XC52fG1dIau+BFD3fNK84AzDrB7quUFVTsa1aSl28=", - "zh:0246fe3dac4a271015db05a9a642a79f089f2c618811e2f62cf43d883d14226e", - "zh:2ed049e51ac35ff2ee49f34873239f2dd31f69fac9462b6f995c48740951a0f9", - "zh:30871283e594f1288ba91fa637ea40c9a63846b83a8dd0d4b332d5f2fa43b63f", - "zh:46e81c2aa9e3c0586eaace027cd3612ba0b010a924af6d0db33d715f0e074c28", - "zh:68547e2994c81fc91712a36d70b76e850e98d5b7a71e0cd21cf1e9b47b783eed", - "zh:6a3930340e3b2c732fe112aa312b6854c0dbd37cabf3b4873672be56bdc8e9c3", - "zh:7660d83d137600b7a01113ba8ed8fdeaf2ca4236a093173e75cef6efaea1b934", - "zh:8752e3e02003dd7ec49f47eb3f60b287e9bbfd5034bb06384901a4c69f1f9287", - "zh:9be1fb6a1d012cdda0c8a7954c8caf73b4b10ec2a926e502a323e1e77f31027a", - "zh:b4c066acae2a13b0d1e3a875921fc88caebeca76c9d4b9d0f88b88f4ec8d6c71", - "zh:bfd7dca405407c561258a636e7abdda5cf8a6a324353aae64aff6ee624ae59a3", - "zh:d8c980a3c7732284a5c0c0b9a22c9432ca344f9b4f94af5df84dfe8ce12036bc", - "zh:e4045b7d34f62f676cadcc237c72a12bb1e82d5ce7748c730dd1b82064f12474", - "zh:eb9e52d91cb069a30b310b7bfd305862e4a8f86d09d1b9d44ea8cd199a7571ae", + "h1:pcyAjQvw5BUajiVGJQ6nVWdocfSnCRdazHwTzjdOh3M=", + "zh:115a656d68c9ac95188a3421dd8aa5a9ba4074d42b717fcc87ffd45576231857", + "zh:1dc3687237d8c2c947ebd5a3c80404c17dbf210cfb7f3b4464fd6e12f6784398", + "zh:24dc4d31edd69977bdf6004d85092d7013f6f7917c24ecb758717962dd7cbfe5", + "zh:2e5def7d74f488070443f86d75fb9813736c085efb5fa1f7e0f6151a2f83a30b", + "zh:6e4502bbd54b0a782b582c4d22aaa43814eae6a0b66f4835648c27f6015d505d", + "zh:8105124f33fa84fd59af3a18ab8534ce7f956c2e8a9d26546adfdbc9e8d7c725", + "zh:8ac9fc28cb06326c51ee2a35ee092e0abbaa2545a72f3318c406e9e5f0ef22a1", + "zh:a17997d6e2aafd488af6fcede3d20acfe72d5d6f0c1d257880657da1eb0a175e", + "zh:b35ea09714425c17578b6473c362380bb9b276d3f8bfff675d1ee7deb11377a7", + "zh:b71dfa4bde00632c0ebc9531274f337891303cf2e647b479d5030c22b33347ba", + "zh:ba51ddc2dc8c8e72426e873b2e3abac0ebfb9724207ba135bb3aa4775a523429", + "zh:bb5631c8c209fc94434164acd7478726f1f8ef40089e68eff12d131a648961bf", + "zh:c165ae439b26834858139fe971b702e5baad74db22b6439784b37690d087ffca", + "zh:d185755f6a0d4783fb42121109eeec4207f9caf35e7066bdf1101d12ae2c2ec8", ] } diff --git a/terragrunt/accounts/root/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/root/datadog-aws/.terraform.lock.hcl index 1520260f0..4cb9fe0ca 100644 --- a/terragrunt/accounts/root/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/root/datadog-aws/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/datadog/datadog" { - version = "3.28.0" - constraints = "3.28.0" + version = "3.43.1" + constraints = "3.43.1" hashes = [ - "h1:U2XC52fG1dIau+BFD3fNK84AzDrB7quUFVTsa1aSl28=", - "zh:0246fe3dac4a271015db05a9a642a79f089f2c618811e2f62cf43d883d14226e", - "zh:2ed049e51ac35ff2ee49f34873239f2dd31f69fac9462b6f995c48740951a0f9", - "zh:30871283e594f1288ba91fa637ea40c9a63846b83a8dd0d4b332d5f2fa43b63f", - "zh:46e81c2aa9e3c0586eaace027cd3612ba0b010a924af6d0db33d715f0e074c28", - "zh:68547e2994c81fc91712a36d70b76e850e98d5b7a71e0cd21cf1e9b47b783eed", - "zh:6a3930340e3b2c732fe112aa312b6854c0dbd37cabf3b4873672be56bdc8e9c3", - "zh:7660d83d137600b7a01113ba8ed8fdeaf2ca4236a093173e75cef6efaea1b934", - "zh:8752e3e02003dd7ec49f47eb3f60b287e9bbfd5034bb06384901a4c69f1f9287", - "zh:9be1fb6a1d012cdda0c8a7954c8caf73b4b10ec2a926e502a323e1e77f31027a", - "zh:b4c066acae2a13b0d1e3a875921fc88caebeca76c9d4b9d0f88b88f4ec8d6c71", - "zh:bfd7dca405407c561258a636e7abdda5cf8a6a324353aae64aff6ee624ae59a3", - "zh:d8c980a3c7732284a5c0c0b9a22c9432ca344f9b4f94af5df84dfe8ce12036bc", - "zh:e4045b7d34f62f676cadcc237c72a12bb1e82d5ce7748c730dd1b82064f12474", - "zh:eb9e52d91cb069a30b310b7bfd305862e4a8f86d09d1b9d44ea8cd199a7571ae", + "h1:pcyAjQvw5BUajiVGJQ6nVWdocfSnCRdazHwTzjdOh3M=", + "zh:115a656d68c9ac95188a3421dd8aa5a9ba4074d42b717fcc87ffd45576231857", + "zh:1dc3687237d8c2c947ebd5a3c80404c17dbf210cfb7f3b4464fd6e12f6784398", + "zh:24dc4d31edd69977bdf6004d85092d7013f6f7917c24ecb758717962dd7cbfe5", + "zh:2e5def7d74f488070443f86d75fb9813736c085efb5fa1f7e0f6151a2f83a30b", + "zh:6e4502bbd54b0a782b582c4d22aaa43814eae6a0b66f4835648c27f6015d505d", + "zh:8105124f33fa84fd59af3a18ab8534ce7f956c2e8a9d26546adfdbc9e8d7c725", + "zh:8ac9fc28cb06326c51ee2a35ee092e0abbaa2545a72f3318c406e9e5f0ef22a1", + "zh:a17997d6e2aafd488af6fcede3d20acfe72d5d6f0c1d257880657da1eb0a175e", + "zh:b35ea09714425c17578b6473c362380bb9b276d3f8bfff675d1ee7deb11377a7", + "zh:b71dfa4bde00632c0ebc9531274f337891303cf2e647b479d5030c22b33347ba", + "zh:ba51ddc2dc8c8e72426e873b2e3abac0ebfb9724207ba135bb3aa4775a523429", + "zh:bb5631c8c209fc94434164acd7478726f1f8ef40089e68eff12d131a648961bf", + "zh:c165ae439b26834858139fe971b702e5baad74db22b6439784b37690d087ffca", + "zh:d185755f6a0d4783fb42121109eeec4207f9caf35e7066bdf1101d12ae2c2ec8", ] } diff --git a/terragrunt/accounts/sync-team-prod/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/sync-team-prod/datadog-aws/.terraform.lock.hcl index 1520260f0..4cb9fe0ca 100644 --- a/terragrunt/accounts/sync-team-prod/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/sync-team-prod/datadog-aws/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/datadog/datadog" { - version = "3.28.0" - constraints = "3.28.0" + version = "3.43.1" + constraints = "3.43.1" hashes = [ - "h1:U2XC52fG1dIau+BFD3fNK84AzDrB7quUFVTsa1aSl28=", - "zh:0246fe3dac4a271015db05a9a642a79f089f2c618811e2f62cf43d883d14226e", - "zh:2ed049e51ac35ff2ee49f34873239f2dd31f69fac9462b6f995c48740951a0f9", - "zh:30871283e594f1288ba91fa637ea40c9a63846b83a8dd0d4b332d5f2fa43b63f", - "zh:46e81c2aa9e3c0586eaace027cd3612ba0b010a924af6d0db33d715f0e074c28", - "zh:68547e2994c81fc91712a36d70b76e850e98d5b7a71e0cd21cf1e9b47b783eed", - "zh:6a3930340e3b2c732fe112aa312b6854c0dbd37cabf3b4873672be56bdc8e9c3", - "zh:7660d83d137600b7a01113ba8ed8fdeaf2ca4236a093173e75cef6efaea1b934", - "zh:8752e3e02003dd7ec49f47eb3f60b287e9bbfd5034bb06384901a4c69f1f9287", - "zh:9be1fb6a1d012cdda0c8a7954c8caf73b4b10ec2a926e502a323e1e77f31027a", - "zh:b4c066acae2a13b0d1e3a875921fc88caebeca76c9d4b9d0f88b88f4ec8d6c71", - "zh:bfd7dca405407c561258a636e7abdda5cf8a6a324353aae64aff6ee624ae59a3", - "zh:d8c980a3c7732284a5c0c0b9a22c9432ca344f9b4f94af5df84dfe8ce12036bc", - "zh:e4045b7d34f62f676cadcc237c72a12bb1e82d5ce7748c730dd1b82064f12474", - "zh:eb9e52d91cb069a30b310b7bfd305862e4a8f86d09d1b9d44ea8cd199a7571ae", + "h1:pcyAjQvw5BUajiVGJQ6nVWdocfSnCRdazHwTzjdOh3M=", + "zh:115a656d68c9ac95188a3421dd8aa5a9ba4074d42b717fcc87ffd45576231857", + "zh:1dc3687237d8c2c947ebd5a3c80404c17dbf210cfb7f3b4464fd6e12f6784398", + "zh:24dc4d31edd69977bdf6004d85092d7013f6f7917c24ecb758717962dd7cbfe5", + "zh:2e5def7d74f488070443f86d75fb9813736c085efb5fa1f7e0f6151a2f83a30b", + "zh:6e4502bbd54b0a782b582c4d22aaa43814eae6a0b66f4835648c27f6015d505d", + "zh:8105124f33fa84fd59af3a18ab8534ce7f956c2e8a9d26546adfdbc9e8d7c725", + "zh:8ac9fc28cb06326c51ee2a35ee092e0abbaa2545a72f3318c406e9e5f0ef22a1", + "zh:a17997d6e2aafd488af6fcede3d20acfe72d5d6f0c1d257880657da1eb0a175e", + "zh:b35ea09714425c17578b6473c362380bb9b276d3f8bfff675d1ee7deb11377a7", + "zh:b71dfa4bde00632c0ebc9531274f337891303cf2e647b479d5030c22b33347ba", + "zh:ba51ddc2dc8c8e72426e873b2e3abac0ebfb9724207ba135bb3aa4775a523429", + "zh:bb5631c8c209fc94434164acd7478726f1f8ef40089e68eff12d131a648961bf", + "zh:c165ae439b26834858139fe971b702e5baad74db22b6439784b37690d087ffca", + "zh:d185755f6a0d4783fb42121109eeec4207f9caf35e7066bdf1101d12ae2c2ec8", ] } diff --git a/terragrunt/modules/datadog-aws/_terraform.tf b/terragrunt/modules/datadog-aws/_terraform.tf index a2545e6b5..29496bfa9 100644 --- a/terragrunt/modules/datadog-aws/_terraform.tf +++ b/terragrunt/modules/datadog-aws/_terraform.tf @@ -8,7 +8,7 @@ terraform { } datadog = { source = "datadog/datadog" - version = "3.28.0" + version = "3.43.1" } } } diff --git a/terragrunt/modules/datadog-fastly/_terraform.tf b/terragrunt/modules/datadog-fastly/_terraform.tf index 1343baa1e..0ece0f213 100644 --- a/terragrunt/modules/datadog-fastly/_terraform.tf +++ b/terragrunt/modules/datadog-fastly/_terraform.tf @@ -8,7 +8,7 @@ terraform { } datadog = { source = "datadog/datadog" - version = "3.28.0" + version = "3.43.1" } fastly = { source = "fastly/fastly" From 7e50afeca448cd07c470c15bc7d4684e3880ab91 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:08:58 +0200 Subject: [PATCH 159/217] add Marco to release_keys_bucket_users --- terraform/releases/keys.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/releases/keys.tf b/terraform/releases/keys.tf index 372ef2bc9..a062dfcf5 100644 --- a/terraform/releases/keys.tf +++ b/terraform/releases/keys.tf @@ -6,6 +6,7 @@ locals { "pietroalbini", "simulacrum", "jdn", + "marcoieni", ] } From f425e583649466abd355d07ec4e0747d0adf021b Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:21:21 +0200 Subject: [PATCH 160/217] chore: update `terraform/rust-forge` to aws provider 5.64 --- terraform/rust-forge/.terraform.lock.hcl | 34 ++++++++++++------------ terraform/rust-forge/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/rust-forge/.terraform.lock.hcl b/terraform/rust-forge/.terraform.lock.hcl index 77adfed63..943e17a5e 100644 --- a/terraform/rust-forge/.terraform.lock.hcl +++ b/terraform/rust-forge/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20, ~> 4.28" + version = "5.64.0" + constraints = ">= 4.20.0, >= 4.28.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/rust-forge/_terraform.tf b/terraform/rust-forge/_terraform.tf index db39c3fca..123c6bb3d 100644 --- a/terraform/rust-forge/_terraform.tf +++ b/terraform/rust-forge/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.67" + version = "~> 5.64" } } From 9f93ad1e2e90814e44f2426a76834bf5db680689 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:32:03 +0200 Subject: [PATCH 161/217] chore: update `terraform/domain-redirects` to aws provider 5.64 --- .../domain-redirects/.terraform.lock.hcl | 34 +++++++++---------- terraform/domain-redirects/_terraform.tf | 2 +- terraform/domain-redirects/impl/main.tf | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/terraform/domain-redirects/.terraform.lock.hcl b/terraform/domain-redirects/.terraform.lock.hcl index c1a7e9c63..6a8362798 100644 --- a/terraform/domain-redirects/.terraform.lock.hcl +++ b/terraform/domain-redirects/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20, ~> 4.67" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/domain-redirects/_terraform.tf b/terraform/domain-redirects/_terraform.tf index 91640de9f..8f781e794 100644 --- a/terraform/domain-redirects/_terraform.tf +++ b/terraform/domain-redirects/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.67" + version = "~> 5.64" } } diff --git a/terraform/domain-redirects/impl/main.tf b/terraform/domain-redirects/impl/main.tf index b052fc488..9a30a3d14 100644 --- a/terraform/domain-redirects/impl/main.tf +++ b/terraform/domain-redirects/impl/main.tf @@ -26,7 +26,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.64" configuration_aliases = [aws.east1] } } From 3401c56eea623d5c27bdbebc3a7d99e0e7c56424 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:42:05 +0200 Subject: [PATCH 162/217] chore: update `terraform/dev-desktops` to aws provider 5.64 --- terraform/dev-desktops/.terraform.lock.hcl | 34 +++++++++---------- terraform/dev-desktops/_terraform.tf | 2 +- .../dev-desktops/aws-region/_terraform.tf | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/terraform/dev-desktops/.terraform.lock.hcl b/terraform/dev-desktops/.terraform.lock.hcl index 3fdeb1389..d6aaee44c 100644 --- a/terraform/dev-desktops/.terraform.lock.hcl +++ b/terraform/dev-desktops/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.67" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/dev-desktops/_terraform.tf b/terraform/dev-desktops/_terraform.tf index 1f755499d..b9033f2c7 100644 --- a/terraform/dev-desktops/_terraform.tf +++ b/terraform/dev-desktops/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.67" + version = "~> 5.64" } } diff --git a/terraform/dev-desktops/aws-region/_terraform.tf b/terraform/dev-desktops/aws-region/_terraform.tf index 702a1fb4e..d33a81069 100644 --- a/terraform/dev-desktops/aws-region/_terraform.tf +++ b/terraform/dev-desktops/aws-region/_terraform.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.67" + version = "~> 5.64" } } } From eaa88b533a768aebf5d298e9e8ff8342976c41dc Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 12:36:26 +0200 Subject: [PATCH 163/217] chore(wiz): update AWS provider version to 5.64 --- .../bors-prod/wiz/.terraform.lock.hcl | 34 +++++++++---------- .../bors-staging/wiz/.terraform.lock.hcl | 34 +++++++++---------- .../crates-io-prod/wiz/.terraform.lock.hcl | 34 +++++++++---------- .../crates-io-staging/wiz/.terraform.lock.hcl | 34 +++++++++---------- .../dev-desktops-prod/wiz/.terraform.lock.hcl | 34 +++++++++---------- .../docs-rs-staging/wiz/.terraform.lock.hcl | 34 +++++++++---------- .../accounts/legacy/wiz/.terraform.lock.hcl | 34 +++++++++---------- .../accounts/root/wiz/.terraform.lock.hcl | 34 +++++++++---------- .../sync-team-prod/wiz/.terraform.lock.hcl | 34 +++++++++---------- terragrunt/modules/wiz/_terraform.tf | 2 +- 10 files changed, 154 insertions(+), 154 deletions(-) diff --git a/terragrunt/accounts/bors-prod/wiz/.terraform.lock.hcl b/terragrunt/accounts/bors-prod/wiz/.terraform.lock.hcl index bcb68997b..bbf28555f 100644 --- a/terragrunt/accounts/bors-prod/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-prod/wiz/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.60.0" - constraints = "~> 5.60" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", - "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", - "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", - "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", - "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", - "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", - "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", - "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", - "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", - "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", - "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", - "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", - "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", - "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/bors-staging/wiz/.terraform.lock.hcl b/terragrunt/accounts/bors-staging/wiz/.terraform.lock.hcl index bcb68997b..bbf28555f 100644 --- a/terragrunt/accounts/bors-staging/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-staging/wiz/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.60.0" - constraints = "~> 5.60" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", - "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", - "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", - "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", - "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", - "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", - "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", - "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", - "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", - "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", - "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", - "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", - "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", - "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/crates-io-prod/wiz/.terraform.lock.hcl b/terragrunt/accounts/crates-io-prod/wiz/.terraform.lock.hcl index bcb68997b..bbf28555f 100644 --- a/terragrunt/accounts/crates-io-prod/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/crates-io-prod/wiz/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.60.0" - constraints = "~> 5.60" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", - "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", - "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", - "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", - "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", - "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", - "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", - "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", - "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", - "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", - "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", - "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", - "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", - "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/crates-io-staging/wiz/.terraform.lock.hcl b/terragrunt/accounts/crates-io-staging/wiz/.terraform.lock.hcl index bcb68997b..bbf28555f 100644 --- a/terragrunt/accounts/crates-io-staging/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/crates-io-staging/wiz/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.60.0" - constraints = "~> 5.60" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", - "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", - "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", - "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", - "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", - "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", - "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", - "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", - "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", - "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", - "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", - "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", - "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", - "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/dev-desktops-prod/wiz/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/wiz/.terraform.lock.hcl index bcb68997b..bbf28555f 100644 --- a/terragrunt/accounts/dev-desktops-prod/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/wiz/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.60.0" - constraints = "~> 5.60" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", - "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", - "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", - "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", - "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", - "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", - "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", - "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", - "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", - "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", - "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", - "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", - "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", - "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/docs-rs-staging/wiz/.terraform.lock.hcl b/terragrunt/accounts/docs-rs-staging/wiz/.terraform.lock.hcl index bcb68997b..bbf28555f 100644 --- a/terragrunt/accounts/docs-rs-staging/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/docs-rs-staging/wiz/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.60.0" - constraints = "~> 5.60" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", - "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", - "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", - "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", - "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", - "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", - "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", - "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", - "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", - "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", - "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", - "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", - "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", - "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/legacy/wiz/.terraform.lock.hcl b/terragrunt/accounts/legacy/wiz/.terraform.lock.hcl index bcb68997b..bbf28555f 100644 --- a/terragrunt/accounts/legacy/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/wiz/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.60.0" - constraints = "~> 5.60" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", - "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", - "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", - "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", - "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", - "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", - "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", - "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", - "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", - "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", - "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", - "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", - "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", - "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/root/wiz/.terraform.lock.hcl b/terragrunt/accounts/root/wiz/.terraform.lock.hcl index bcb68997b..bbf28555f 100644 --- a/terragrunt/accounts/root/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/root/wiz/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.60.0" - constraints = "~> 5.60" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", - "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", - "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", - "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", - "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", - "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", - "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", - "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", - "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", - "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", - "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", - "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", - "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", - "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/sync-team-prod/wiz/.terraform.lock.hcl b/terragrunt/accounts/sync-team-prod/wiz/.terraform.lock.hcl index bcb68997b..bbf28555f 100644 --- a/terragrunt/accounts/sync-team-prod/wiz/.terraform.lock.hcl +++ b/terragrunt/accounts/sync-team-prod/wiz/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.60.0" - constraints = "~> 5.60" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", - "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", - "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", - "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", - "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", - "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", - "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", - "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", - "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", - "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", - "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", - "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", - "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", - "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/modules/wiz/_terraform.tf b/terragrunt/modules/wiz/_terraform.tf index 112d81ff3..05ae394e7 100644 --- a/terragrunt/modules/wiz/_terraform.tf +++ b/terragrunt/modules/wiz/_terraform.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.60" + version = "~> 5.64" } } } From f3ba94ae986115015ea36cee5558d2f0c4a00759 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:33:24 +0200 Subject: [PATCH 164/217] chore: update datadog-aws aws terraform provider to 5.64 --- .../bors-prod/datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../legacy/datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../root/datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- .../datadog-aws/.terraform.lock.hcl | 34 +++++++++---------- terragrunt/modules/datadog-aws/_terraform.tf | 2 +- 10 files changed, 154 insertions(+), 154 deletions(-) diff --git a/terragrunt/accounts/bors-prod/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/bors-prod/datadog-aws/.terraform.lock.hcl index 4cb9fe0ca..dd64863f4 100644 --- a/terragrunt/accounts/bors-prod/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-prod/datadog-aws/.terraform.lock.hcl @@ -24,24 +24,24 @@ provider "registry.terraform.io/datadog/datadog" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/bors-staging/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/bors-staging/datadog-aws/.terraform.lock.hcl index 4cb9fe0ca..dd64863f4 100644 --- a/terragrunt/accounts/bors-staging/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-staging/datadog-aws/.terraform.lock.hcl @@ -24,24 +24,24 @@ provider "registry.terraform.io/datadog/datadog" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/crates-io-prod/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/crates-io-prod/datadog-aws/.terraform.lock.hcl index 4cb9fe0ca..dd64863f4 100644 --- a/terragrunt/accounts/crates-io-prod/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/crates-io-prod/datadog-aws/.terraform.lock.hcl @@ -24,24 +24,24 @@ provider "registry.terraform.io/datadog/datadog" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/crates-io-staging/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/crates-io-staging/datadog-aws/.terraform.lock.hcl index 4cb9fe0ca..dd64863f4 100644 --- a/terragrunt/accounts/crates-io-staging/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/crates-io-staging/datadog-aws/.terraform.lock.hcl @@ -24,24 +24,24 @@ provider "registry.terraform.io/datadog/datadog" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/dev-desktops-prod/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/datadog-aws/.terraform.lock.hcl index 4cb9fe0ca..dd64863f4 100644 --- a/terragrunt/accounts/dev-desktops-prod/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/datadog-aws/.terraform.lock.hcl @@ -24,24 +24,24 @@ provider "registry.terraform.io/datadog/datadog" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/docs-rs-staging/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/docs-rs-staging/datadog-aws/.terraform.lock.hcl index 4cb9fe0ca..dd64863f4 100644 --- a/terragrunt/accounts/docs-rs-staging/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/docs-rs-staging/datadog-aws/.terraform.lock.hcl @@ -24,24 +24,24 @@ provider "registry.terraform.io/datadog/datadog" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/legacy/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/legacy/datadog-aws/.terraform.lock.hcl index 4cb9fe0ca..dd64863f4 100644 --- a/terragrunt/accounts/legacy/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/datadog-aws/.terraform.lock.hcl @@ -24,24 +24,24 @@ provider "registry.terraform.io/datadog/datadog" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/root/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/root/datadog-aws/.terraform.lock.hcl index 4cb9fe0ca..dd64863f4 100644 --- a/terragrunt/accounts/root/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/root/datadog-aws/.terraform.lock.hcl @@ -24,24 +24,24 @@ provider "registry.terraform.io/datadog/datadog" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/sync-team-prod/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/sync-team-prod/datadog-aws/.terraform.lock.hcl index 4cb9fe0ca..dd64863f4 100644 --- a/terragrunt/accounts/sync-team-prod/datadog-aws/.terraform.lock.hcl +++ b/terragrunt/accounts/sync-team-prod/datadog-aws/.terraform.lock.hcl @@ -24,24 +24,24 @@ provider "registry.terraform.io/datadog/datadog" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/modules/datadog-aws/_terraform.tf b/terragrunt/modules/datadog-aws/_terraform.tf index 29496bfa9..221e0224a 100644 --- a/terragrunt/modules/datadog-aws/_terraform.tf +++ b/terragrunt/modules/datadog-aws/_terraform.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.32" + version = "~> 5.64" } datadog = { source = "datadog/datadog" From 4a8249ac6320371e39662b96ca9b27252339db36 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:04:54 +0200 Subject: [PATCH 165/217] chore(bors): update AWS provider version to 5.64 --- .../bors-prod/app/.terraform.lock.hcl | 32 +++++++++---------- .../bors-staging/app/.terraform.lock.hcl | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/terragrunt/accounts/bors-prod/app/.terraform.lock.hcl b/terragrunt/accounts/bors-prod/app/.terraform.lock.hcl index 1de87ff64..3cc980b06 100644 --- a/terragrunt/accounts/bors-prod/app/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-prod/app/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.60.0" + version = "5.64.0" hashes = [ - "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", - "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", - "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", - "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", - "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", - "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", - "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", - "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", - "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", - "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", - "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", - "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", - "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", - "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/bors-staging/app/.terraform.lock.hcl b/terragrunt/accounts/bors-staging/app/.terraform.lock.hcl index 1de87ff64..3cc980b06 100644 --- a/terragrunt/accounts/bors-staging/app/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-staging/app/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.60.0" + version = "5.64.0" hashes = [ - "h1:p9+40kdklLTJLQ/y7wxNjuKxUK8AVB4L9424NGNK4rY=", - "zh:08f49c9eb865e136a55dda3eb2b790f6d55cdac49f6638391dbea4b865cf307b", - "zh:090dd8b40ebf0f8e9ea05b9a142add9caeb7988d3d96c5c112e8c67c0edf566f", - "zh:30f336af1b4f0824fce2cc6e81af0986b325b135436c9d892d081e435aeed67e", - "zh:338195ca3b41249874110253412d8913f770c22294af05799ea1e343050906f5", - "zh:3a8a45b17750b01192a0fbeeed0d05c2c04840344d78d5e3233b3ecbeec17a1c", - "zh:486efe72d39f0736d9b7e00e5b889288264458a57aa0cff2d75688d6db372ee5", - "zh:5fdccc448a085fea8ecfae43ae326840abfcdf1a0aa8b8c79dd466392aa5cc3a", - "zh:9521639755cd07ec7efde86a534770e436e16a93692d070a00f6419c1038d59c", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c2fb9240a069da9f51e7379e76c3dfaad15a97430c2e32708a7d18345434e310", - "zh:daba836b89537dfa72bb8c77e88850c20fda2a3d0f5b3803cd3d6da0ce283e3e", - "zh:db7e0755ed120ed8311f6663f49aa7157da5072b906727db3a6c47d64e0b82c6", - "zh:ea5e3fca5197639c4ad1415ca96de2924a351ecd1a885dd9184843d5eec18dbb", - "zh:f3f322951d311e45a47361f24790a90a0b8ba6d3829a00c4066a361960d2ecef", - "zh:f48b44f4887d4b51a1406057f15f1e2161cb02b271b2659349958904c678e91c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } From 239e160165996768bb0849a086ccca3784988b3e Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:11:44 +0200 Subject: [PATCH 166/217] chore: update `sync-team-prod/common` to aws provider 5.64 --- .../sync-team-prod/common/.terraform.lock.hcl | 60 +++++++++---------- terragrunt/modules/common/_terraform.tf | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/terragrunt/accounts/sync-team-prod/common/.terraform.lock.hcl b/terragrunt/accounts/sync-team-prod/common/.terraform.lock.hcl index 43bd7528d..df1d1b9fb 100644 --- a/terragrunt/accounts/sync-team-prod/common/.terraform.lock.hcl +++ b/terragrunt/accounts/sync-team-prod/common/.terraform.lock.hcl @@ -2,44 +2,44 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.58.0" - constraints = "~> 4.20" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:xXjZy36R+YOFyLjuF+rgi0NDLwnkFwrJ2t9NfsjRM/E=", - "zh:14b2b2dfbc7ee705c412d762b1485ee08958c816a64ac74f5769e946e4a1d265", - "zh:17a37e6825e2023b18987d31c0cbb9336654ea146b68e6c90710ea4636af71ae", - "zh:273127c69fb244577e5c136c46164d34f77b0c956c18d27f63d1072dd558f924", - "zh:4b2b6416d34fb3e1051c99d2a84045b136976140e34381d5fbf90e32db15272e", - "zh:7e6a8571ff15d51f892776265642ee01004b8553fd4f6f2014b6f3f2834670c7", - "zh:847c76ab2381b66666d0f79cf1ac697b5bfd0d9c3009fd11bc6ad6545d1eb427", - "zh:9a52cae08ba8d27d0639a8d2b8c61591027883058bf0cc5a639cffe1e299f019", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9df647e8322d6f94f1843366ba39d21c4b36c8e7dcdc03711d52e27f73b0e974", - "zh:9e52037e68409802ff913b166c30e3f2035af03865cbef0c1b03762bce853941", - "zh:a30288e7c3c904d6998d1709835d7c5800a739f8608f0837f960286a2b8b6e59", - "zh:a7f24e3bda3be566468e4ad62cef1016f68c6f5a94d2e3e979485bc05626281b", - "zh:ba326ba80f5e39829b67a6d1ce54ba52b171e5e13a0a91ef5f9170a9b0cc9ce4", - "zh:c4e3fe9f2be6e244a3dfce599f4b0be9e8fffaece64cbc65f3195f825f65489b", - "zh:f20a251af37039bb2c7612dbd2c5df3a25886b4cc78f902385a2850ea6e30d08", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } provider "registry.terraform.io/hashicorp/tls" { - version = "4.0.4" + version = "4.0.5" constraints = "~> 4.0" hashes = [ - "h1:pe9vq86dZZKCm+8k1RhzARwENslF3SXb9ErHbQfgjXU=", - "zh:23671ed83e1fcf79745534841e10291bbf34046b27d6e68a5d0aab77206f4a55", - "zh:45292421211ffd9e8e3eb3655677700e3c5047f71d8f7650d2ce30242335f848", - "zh:59fedb519f4433c0fdb1d58b27c210b27415fddd0cd73c5312530b4309c088be", - "zh:5a8eec2409a9ff7cd0758a9d818c74bcba92a240e6c5e54b99df68fff312bbd5", - "zh:5e6a4b39f3171f53292ab88058a59e64825f2b842760a4869e64dc1dc093d1fe", - "zh:810547d0bf9311d21c81cc306126d3547e7bd3f194fc295836acf164b9f8424e", - "zh:824a5f3617624243bed0259d7dd37d76017097dc3193dac669be342b90b2ab48", - "zh:9361ccc7048be5dcbc2fafe2d8216939765b3160bd52734f7a9fd917a39ecbd8", - "zh:aa02ea625aaf672e649296bce7580f62d724268189fe9ad7c1b36bb0fa12fa60", - "zh:c71b4cd40d6ec7815dfeefd57d88bc592c0c42f5e5858dcc88245d371b4b8b1e", - "zh:dabcd52f36b43d250a3d71ad7abfa07b5622c69068d989e60b79b2bb4f220316", + "h1:zeG5RmggBZW/8JWIVrdaeSJa0OG62uFX5HY1eE8SjzY=", + "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", + "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", + "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", + "zh:1e3bb505c000adb12cdf60af5b08f0ed68bc3955b0d4d4a126db5ca4d429eb4a", + "zh:6636401b2463c25e03e68a6b786acf91a311c78444b1dc4f97c539f9f78de22a", + "zh:76858f9d8b460e7b2a338c477671d07286b0d287fd2d2e3214030ae8f61dd56e", + "zh:a13b69fb43cb8746793b3069c4d897bb18f454290b496f19d03c3387d1c9a2dc", + "zh:a90ca81bb9bb509063b736842250ecff0f886a91baae8de65c8430168001dad9", + "zh:c4de401395936e41234f1956ebadbd2ed9f414e6908f27d578614aaa529870d4", + "zh:c657e121af8fde19964482997f0de2d5173217274f6997e16389e7707ed8ece8", + "zh:d68b07a67fbd604c38ec9733069fbf23441436fecf554de6c75c032f82e1ef19", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } diff --git a/terragrunt/modules/common/_terraform.tf b/terragrunt/modules/common/_terraform.tf index f596c7fd9..9ad00d065 100644 --- a/terragrunt/modules/common/_terraform.tf +++ b/terragrunt/modules/common/_terraform.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.64" } tls = { source = "hashicorp/tls" From 10939237b20acd724e719367df9dd7876ad80b40 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:31:30 +0200 Subject: [PATCH 167/217] chore: update `terraform/shared` dns provider --- terraform/shared/.terraform.lock.hcl | 62 +++++++++++++++------------- terraform/shared/main.tf | 4 +- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/terraform/shared/.terraform.lock.hcl b/terraform/shared/.terraform.lock.hcl index f2aca1163..c0e31de76 100644 --- a/terraform/shared/.terraform.lock.hcl +++ b/terraform/shared/.terraform.lock.hcl @@ -2,42 +2,45 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.28.0" - constraints = "~> 4.20, ~> 4.28" + version = "4.67.0" + constraints = ">= 4.20.0, >= 4.28.0, ~> 4.67, < 6.0.0" hashes = [ - "h1:TXCUuuaf2q54C43bxSNiF9g+cxTr8zqEZem0pW15cjE=", - "zh:1d4806e50971d2cd565273cedf3206e38931677a6f546cf2b9fb140b52b80604", - "zh:3f076791002b8afa5ba2d2038f1e1db5956022327eb5242152723ed410ae4571", - "zh:40e5944a9df0d083dbd316bcc6ac9ceada5c00dab70c21897e62b68c4c936bc9", - "zh:68b78d0c1866aa0bcbbadb1cf51349c9af697f8789f5778b7e7e2912a9c4845d", - "zh:72d6e66136841c0e5ae264e03555cf59751ddae1b9784eafcb877c624332c70a", - "zh:902c8f89dc10d321b87c09270c27a31a42d4e74e4da1608e55b7f241cd010a62", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:bf54c9f55d420b4e1fe68db81a759c40b9f9747159dea3061212a1c9768dcdfd", - "zh:bfbe7e745c420a4ebd27ca35dfe5c2acc7cdd05092e1daf60f5ae29a1130d752", - "zh:d271a30b16f0861f020e423d120d1458cf1757e740e016ace22084c39dc13550", - "zh:f1e4672d1625fd1f1268d4b807cb90e28150d46fb2d0dd0836de65db29c8d5e6", - "zh:f5cee910b4db2da3c2a28dae9055cbca4273eb774c362bb7bb5bde04deff4557", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } provider "registry.terraform.io/hashicorp/dns" { - version = "2.2.0" - constraints = "~> 2.2.0" + version = "3.4.1" + constraints = "~> 3.4.1" hashes = [ - "h1:qltTuVDorrumM3+cemZ/9K+6qdFTmVjwbxPFMP/88J8=", - "zh:05ebc6f930c9fafaa8e3d929eef6cbb574dd3482c3cf5ac8ed34953567b2f2da", - "zh:34ad830cb5612ace4ba1f1fb56b35b3ce37ba565e9bd98b64701a5b8294df1b0", - "zh:427d1d0911e5170ffa30c65b7a1c6aed6a6c9eaa6b2a7ca4b955129a25ab2ad4", - "zh:5f909596ea24da039cd45c6f7da8155f3ebc582e2798b66dcd72d62d3ad4317b", - "zh:6ae64cb2d43e62b494bbc1ef8164895a1fd6303f18fa3164296c2f1f7e703801", - "zh:84750bcb90a7762ea2315cd54194255051b0cf4aff55755c6edf87e5f88cc692", - "zh:8d4e0710b17dc830f72f4e1bf6a75c05134c137153b5d12e3b7f67ac61dc5a1c", - "zh:a9849e99ea2c5c8d18faaf06288abe68271fff9b19ee471226c7e68f3626665e", - "zh:bcd463bce6b65a42a9bb6be0b7179e9829d4548e34d5bfaf892958abee7ac2ba", - "zh:cf1cdff8c4a09d3c7c3fece74835f9306014b50416a17d3e3966f4bf58596782", - "zh:e0cafa962fcccff280e4c74fe3701b2bb09e7d6b99e94a8ef0d5db9566dcc7bf", - "zh:eae89d4ad0baefe450be9c5c6f9904f5a4c6e42c42e4556f23c9856ae290e30d", + "h1:Ds8mPH2ZDdHsvcZTFaM7KgmRlyIaxv1T6zxUOioNso0=", + "zh:00fc9ba46d66a35c0f4cb66d19b402280f5d074a5652b6a378aac9b11b93d069", + "zh:0d612631e82f246d1e7ee20d3dff29ad1c328d1cec0a3b030719e6246676737b", + "zh:29b847c53ea307acf7ed923c751f3051aae3308a23ba376ad86b120c0f6b978b", + "zh:4b5612e01d369ba56abe87daaea12e65114da9befdd080bf26269dfcbd1c07fa", + "zh:5a2e3af49eabe6592bc24ff6c718872cc8a3fbc3b7be152b00d124ef1dd5d0bd", + "zh:6570128aa7cb71390f78b9aa918c937f1ab0d695e8d7a0b38b84713d2cc92893", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:874cbc34ef9973e4b1f894d910e7f853cc317ee6b5208179d41c1bfa51831425", + "zh:946d5fbe75d4fc0fdc1d2deea85a5e02ec46f6830731f9414884276b7c3ec4bc", + "zh:b1cde393e83634c733649caea76ef6f4f14f01f2b04e8c90926ccbb49ac6c53d", + "zh:b803d82cf6fc8ae6660f896144e065d6ed032273a3eb418e62b39a7dec73f734", + "zh:e8d8b93b1c13b199c929819b2b049627a6d3874fd3f16e05b3f594d526233dd6", ] } @@ -45,6 +48,7 @@ provider "registry.terraform.io/hashicorp/tls" { version = "3.1.0" constraints = "3.1.0" hashes = [ + "h1:U+kgPLboCrcs4eZV87esP7iydF8mjMyHKE/mDsrwfkQ=", "h1:fUJX8Zxx38e2kBln+zWr1Tl41X+OuiE++REjrEyiOM4=", "zh:3d46616b41fea215566f4a957b6d3a1aa43f1f75c26776d72a98bdba79439db6", "zh:623a203817a6dafa86f1b4141b645159e07ec418c82fe40acd4d2a27543cbaa2", diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf index 560a6456b..fcc20fbea 100644 --- a/terraform/shared/main.tf +++ b/terraform/shared/main.tf @@ -4,11 +4,11 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 4.67" } dns = { source = "hashicorp/dns" - version = "~> 2.2.0" + version = "~> 3.4.1" } tls = { source = "hashicorp/tls" From ba9bafee81f9ebfe759238c067400e21feafd58a Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:49:29 +0200 Subject: [PATCH 168/217] chore: update `terraform/shared` to aws provider 5.64 --- terraform/shared/.terraform.lock.hcl | 34 +++++++++---------- terraform/shared/main.tf | 2 +- terraform/shared/services/ecs-cluster/main.tf | 3 +- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/terraform/shared/.terraform.lock.hcl b/terraform/shared/.terraform.lock.hcl index c0e31de76..d8c8d9ee5 100644 --- a/terraform/shared/.terraform.lock.hcl +++ b/terraform/shared/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = ">= 4.20.0, >= 4.28.0, ~> 4.67, < 6.0.0" + version = "5.64.0" + constraints = ">= 4.20.0, >= 4.28.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf index fcc20fbea..5e5e5430b 100644 --- a/terraform/shared/main.tf +++ b/terraform/shared/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.67" + version = "~> 5.64" } dns = { source = "hashicorp/dns" diff --git a/terraform/shared/services/ecs-cluster/main.tf b/terraform/shared/services/ecs-cluster/main.tf index 93c103681..f7506b50f 100644 --- a/terraform/shared/services/ecs-cluster/main.tf +++ b/terraform/shared/services/ecs-cluster/main.tf @@ -14,8 +14,7 @@ locals { } resource "aws_ecs_cluster" "cluster" { - name = var.cluster_name - capacity_providers = ["FARGATE", "FARGATE_SPOT"] + name = var.cluster_name setting { name = "containerInsights" From fc27557b55322e668eb6c717237269ac753181fc Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:56:55 +0200 Subject: [PATCH 169/217] chore: update `terraform/shared` tls provider --- terraform/shared/.terraform.lock.hcl | 30 ++++++++++++++-------------- terraform/shared/main.tf | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/terraform/shared/.terraform.lock.hcl b/terraform/shared/.terraform.lock.hcl index d8c8d9ee5..40a3156fb 100644 --- a/terraform/shared/.terraform.lock.hcl +++ b/terraform/shared/.terraform.lock.hcl @@ -45,21 +45,21 @@ provider "registry.terraform.io/hashicorp/dns" { } provider "registry.terraform.io/hashicorp/tls" { - version = "3.1.0" - constraints = "3.1.0" + version = "4.0.5" + constraints = "4.0.5" hashes = [ - "h1:U+kgPLboCrcs4eZV87esP7iydF8mjMyHKE/mDsrwfkQ=", - "h1:fUJX8Zxx38e2kBln+zWr1Tl41X+OuiE++REjrEyiOM4=", - "zh:3d46616b41fea215566f4a957b6d3a1aa43f1f75c26776d72a98bdba79439db6", - "zh:623a203817a6dafa86f1b4141b645159e07ec418c82fe40acd4d2a27543cbaa2", - "zh:668217e78b210a6572e7b0ecb4134a6781cc4d738f4f5d09eb756085b082592e", - "zh:95354df03710691773c8f50a32e31fca25f124b7f3d6078265fdf3c4e1384dca", - "zh:9f97ab190380430d57392303e3f36f4f7835c74ea83276baa98d6b9a997c3698", - "zh:a16f0bab665f8d933e95ca055b9c8d5707f1a0dd8c8ecca6c13091f40dc1e99d", - "zh:be274d5008c24dc0d6540c19e22dbb31ee6bfdd0b2cddd4d97f3cd8a8d657841", - "zh:d5faa9dce0a5fc9d26b2463cea5be35f8586ab75030e7fa4d4920cd73ee26989", - "zh:e9b672210b7fb410780e7b429975adcc76dd557738ecc7c890ea18942eb321a5", - "zh:eb1f8368573d2370605d6dbf60f9aaa5b64e55741d96b5fb026dbfe91de67c0d", - "zh:fc1e12b713837b85daf6c3bb703d7795eaf1c5177aebae1afcf811dd7009f4b0", + "h1:zeG5RmggBZW/8JWIVrdaeSJa0OG62uFX5HY1eE8SjzY=", + "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", + "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", + "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", + "zh:1e3bb505c000adb12cdf60af5b08f0ed68bc3955b0d4d4a126db5ca4d429eb4a", + "zh:6636401b2463c25e03e68a6b786acf91a311c78444b1dc4f97c539f9f78de22a", + "zh:76858f9d8b460e7b2a338c477671d07286b0d287fd2d2e3214030ae8f61dd56e", + "zh:a13b69fb43cb8746793b3069c4d897bb18f454290b496f19d03c3387d1c9a2dc", + "zh:a90ca81bb9bb509063b736842250ecff0f886a91baae8de65c8430168001dad9", + "zh:c4de401395936e41234f1956ebadbd2ed9f414e6908f27d578614aaa529870d4", + "zh:c657e121af8fde19964482997f0de2d5173217274f6997e16389e7707ed8ece8", + "zh:d68b07a67fbd604c38ec9733069fbf23441436fecf554de6c75c032f82e1ef19", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } diff --git a/terraform/shared/main.tf b/terraform/shared/main.tf index 5e5e5430b..74ff24a60 100644 --- a/terraform/shared/main.tf +++ b/terraform/shared/main.tf @@ -12,7 +12,7 @@ terraform { } tls = { source = "hashicorp/tls" - version = "3.1.0" + version = "4.0.5" } } From f69ccbe5de1ed101411fd20f299471b6fa62418a Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 16:19:27 +0200 Subject: [PATCH 170/217] chore: update `bors-prod/dns-zone` to aws provider 5.64 --- .../bors-prod/dns-zone/.terraform.lock.hcl | 32 +++++++++---------- .../bors-staging/dns-zone/.terraform.lock.hcl | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/terragrunt/accounts/bors-prod/dns-zone/.terraform.lock.hcl b/terragrunt/accounts/bors-prod/dns-zone/.terraform.lock.hcl index 32c87d319..250398d18 100644 --- a/terragrunt/accounts/bors-prod/dns-zone/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-prod/dns-zone/.terraform.lock.hcl @@ -2,23 +2,23 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.2.0" + version = "5.64.0" hashes = [ - "h1:NB70SyXuleF41iKoGtzs61f8xZtGJ+M4bxFI0DeHOzg=", - "zh:0e48449e9f29b64663e7ff641a3ba1da434608460c33a20bdb45efeb1e067d4a", - "zh:0ec657a1e586087368cc3051ccb8bdf67e8763e50eece76b8dc4695f8d349ebb", - "zh:1cff541e792477c4dc8b8405a6f76a56d1292e23d6fc367993efed2b3988c208", - "zh:312e7c0c56742cb83d18cb2a3f2da35f4d92481353b0ac2b54d6333df91c2399", - "zh:352bc8a73fdb829306c141fffcb170172c7860c9fff0e02239ef8c771b3468a3", - "zh:4d5403f8d5a8da4db6bcf9d8b60fc790b2f2e1cf49438bb2c3f6c2ccbfa672cb", - "zh:4d90c9a759778a55274f05f69c8b38a2d0d1def792bb556ac6194e5979653f55", - "zh:9033d03e08967bf1ebb420cb1f6e77750a7aa75036a53a0b6709fdc107a829d9", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a8cbffecf5f128081cf62dbd6e2d68105031d08c3499e34dcb6692cc147dec9d", - "zh:bf0778aa0b53e3e65c25fdc4f1b639f4082a01226400958e4135630e2d132d56", - "zh:c9da1ae68faa4bc9f585d175eb666cbfcddafcdcfd6a18f3ecd071631fb4d4c5", - "zh:cbc04edd7a868cf2713fd301ca357adb940003d0c02f5351c987e2ab6ead2a46", - "zh:dae64f3047f18fabe7c5e9d6bccfb7f4b4793994cea0947dc1ac17e1922bf715", - "zh:f7bad3983479af95b5b1cbe43305fa6492222cc4f17a512677dfab7c98cc480c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/bors-staging/dns-zone/.terraform.lock.hcl b/terragrunt/accounts/bors-staging/dns-zone/.terraform.lock.hcl index 32c87d319..250398d18 100644 --- a/terragrunt/accounts/bors-staging/dns-zone/.terraform.lock.hcl +++ b/terragrunt/accounts/bors-staging/dns-zone/.terraform.lock.hcl @@ -2,23 +2,23 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.2.0" + version = "5.64.0" hashes = [ - "h1:NB70SyXuleF41iKoGtzs61f8xZtGJ+M4bxFI0DeHOzg=", - "zh:0e48449e9f29b64663e7ff641a3ba1da434608460c33a20bdb45efeb1e067d4a", - "zh:0ec657a1e586087368cc3051ccb8bdf67e8763e50eece76b8dc4695f8d349ebb", - "zh:1cff541e792477c4dc8b8405a6f76a56d1292e23d6fc367993efed2b3988c208", - "zh:312e7c0c56742cb83d18cb2a3f2da35f4d92481353b0ac2b54d6333df91c2399", - "zh:352bc8a73fdb829306c141fffcb170172c7860c9fff0e02239ef8c771b3468a3", - "zh:4d5403f8d5a8da4db6bcf9d8b60fc790b2f2e1cf49438bb2c3f6c2ccbfa672cb", - "zh:4d90c9a759778a55274f05f69c8b38a2d0d1def792bb556ac6194e5979653f55", - "zh:9033d03e08967bf1ebb420cb1f6e77750a7aa75036a53a0b6709fdc107a829d9", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a8cbffecf5f128081cf62dbd6e2d68105031d08c3499e34dcb6692cc147dec9d", - "zh:bf0778aa0b53e3e65c25fdc4f1b639f4082a01226400958e4135630e2d132d56", - "zh:c9da1ae68faa4bc9f585d175eb666cbfcddafcdcfd6a18f3ecd071631fb4d4c5", - "zh:cbc04edd7a868cf2713fd301ca357adb940003d0c02f5351c987e2ab6ead2a46", - "zh:dae64f3047f18fabe7c5e9d6bccfb7f4b4793994cea0947dc1ac17e1922bf715", - "zh:f7bad3983479af95b5b1cbe43305fa6492222cc4f17a512677dfab7c98cc480c", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } From 41ca2ca7d17826a4b46dfea763d7f0d40a7a300e Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 16:23:35 +0200 Subject: [PATCH 171/217] chore(datadog-fastly): Update `hashicorp/aws` provider to version 5.64 --- .../legacy/datadog-fastly/.terraform.lock.hcl | 34 +++++++++---------- .../modules/datadog-fastly/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl b/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl index 5ff860f09..63efbfa53 100644 --- a/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/datadog-fastly/.terraform.lock.hcl @@ -46,24 +46,24 @@ provider "registry.terraform.io/fastly/fastly" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/modules/datadog-fastly/_terraform.tf b/terragrunt/modules/datadog-fastly/_terraform.tf index 0ece0f213..7a840b11c 100644 --- a/terragrunt/modules/datadog-fastly/_terraform.tf +++ b/terragrunt/modules/datadog-fastly/_terraform.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.32" + version = "~> 5.64" } datadog = { source = "datadog/datadog" From 58b6197323ed7d85944adcc51ff80a81ff3301bb Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:09:01 +0200 Subject: [PATCH 172/217] chore(win-rustup-rs): Update `hashicorp/aws` provider to version 5.64 --- .../win-rustup-rs/.terraform.lock.hcl | 34 +++++++++---------- .../modules/acm-certificate/_terraform.tf | 5 +-- .../modules/win-rustup-rs/_terraform.tf | 3 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/.terraform.lock.hcl b/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/.terraform.lock.hcl index 777f97bd4..6a8362798 100644 --- a/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/rustup-dev/win-rustup-rs/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/modules/acm-certificate/_terraform.tf b/terragrunt/modules/acm-certificate/_terraform.tf index fe1fe446c..bc6af0f29 100644 --- a/terragrunt/modules/acm-certificate/_terraform.tf +++ b/terragrunt/modules/acm-certificate/_terraform.tf @@ -1,8 +1,9 @@ terraform { required_providers { aws = { - source = "hashicorp/aws" - version = "~> 4.20" + source = "hashicorp/aws" + // Allow both 4.x and 5.x while we upgrade everything to 5.x. + version = ">= 4.20, < 6" } } } diff --git a/terragrunt/modules/win-rustup-rs/_terraform.tf b/terragrunt/modules/win-rustup-rs/_terraform.tf index 6e71aed42..05ae394e7 100644 --- a/terragrunt/modules/win-rustup-rs/_terraform.tf +++ b/terragrunt/modules/win-rustup-rs/_terraform.tf @@ -4,8 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.64" } } } - From 67f0afb39bb933c87edf804a0c03b40869f648f6 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:11:06 +0200 Subject: [PATCH 173/217] update deployed ref --- .../accounts/legacy/rustup-prod/deployed-ref | 2 +- .../win-rustup-rs/.terraform.lock.hcl | 34 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terragrunt/accounts/legacy/rustup-prod/deployed-ref b/terragrunt/accounts/legacy/rustup-prod/deployed-ref index 940419f50..2bfd8a27e 100644 --- a/terragrunt/accounts/legacy/rustup-prod/deployed-ref +++ b/terragrunt/accounts/legacy/rustup-prod/deployed-ref @@ -1 +1 @@ -c97fada40ece07066e5e081e26456ea4c3738aa5 +58b6197323ed7d85944adcc51ff80a81ff3301bb diff --git a/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/.terraform.lock.hcl b/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/.terraform.lock.hcl index 777f97bd4..6a8362798 100644 --- a/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/rustup-prod/win-rustup-rs/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } From b9be8b43102aab0f6b6ea80f10d612e56a34a72e Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:20:10 +0200 Subject: [PATCH 174/217] chore(crates-io): Update `hashicorp/aws` provider to version 5.64 --- .../crates-io/.terraform.lock.hcl | 34 +++++++++---------- terragrunt/modules/crates-io/_terraform.tf | 2 +- .../fastly-tls-subscription/_terraform.tf | 5 +-- 3 files changed, 21 insertions(+), 20 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 86ec126a8..9082ed516 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 @@ -24,25 +24,25 @@ provider "registry.terraform.io/fastly/fastly" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/modules/crates-io/_terraform.tf b/terragrunt/modules/crates-io/_terraform.tf index b8c3174d8..8ead06e19 100644 --- a/terragrunt/modules/crates-io/_terraform.tf +++ b/terragrunt/modules/crates-io/_terraform.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.64" configuration_aliases = [aws.us-east-1, aws.eu-west-1] } fastly = { diff --git a/terragrunt/modules/fastly-tls-subscription/_terraform.tf b/terragrunt/modules/fastly-tls-subscription/_terraform.tf index 47a456d13..eb379e7b7 100644 --- a/terragrunt/modules/fastly-tls-subscription/_terraform.tf +++ b/terragrunt/modules/fastly-tls-subscription/_terraform.tf @@ -3,8 +3,9 @@ terraform { required_providers { aws = { - source = "hashicorp/aws" - version = "~> 4.20" + source = "hashicorp/aws" + // Allow both 4.x and 5.x while we upgrade everything to 5.x. + version = ">= 4.20, < 6" } fastly = { source = "fastly/fastly" From 2352215b71a27d92f40d1a58ffdfbbdfe6ff8bc3 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:23:39 +0200 Subject: [PATCH 175/217] update crates-io-prod deployed ref --- .../crates-io/.terraform.lock.hcl | 34 +++++++++---------- .../legacy/crates-io-prod/deployed-ref | 2 +- 2 files changed, 18 insertions(+), 18 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 86ec126a8..9082ed516 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,25 +24,25 @@ provider "registry.terraform.io/fastly/fastly" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/accounts/legacy/crates-io-prod/deployed-ref b/terragrunt/accounts/legacy/crates-io-prod/deployed-ref index 5047e66f7..6d96d20b7 100644 --- a/terragrunt/accounts/legacy/crates-io-prod/deployed-ref +++ b/terragrunt/accounts/legacy/crates-io-prod/deployed-ref @@ -1 +1 @@ -85122f530ed837cc0f8aa7c31e03b15cb1e3f015 +b9be8b43102aab0f6b6ea80f10d612e56a34a72e From 4288556792b72d55e7e6d0584bc37472644a4f57 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:39:06 +0200 Subject: [PATCH 176/217] chore(release-distribution): Update `hashicorp/aws` provider to 5.64 --- .../release-distribution/.terraform.lock.hcl | 34 +++++++++---------- terragrunt/modules/aws-lambda/main.tf | 2 +- .../release-distribution/_terraform.tf | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) 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 fcf8a9e2c..9082ed516 100644 --- a/terragrunt/accounts/legacy/releases-dev/release-distribution/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/releases-dev/release-distribution/.terraform.lock.hcl @@ -24,25 +24,25 @@ provider "registry.terraform.io/fastly/fastly" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20, ~> 4.32" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/modules/aws-lambda/main.tf b/terragrunt/modules/aws-lambda/main.tf index ec598729f..eb684d99f 100644 --- a/terragrunt/modules/aws-lambda/main.tf +++ b/terragrunt/modules/aws-lambda/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.64" } } } diff --git a/terragrunt/modules/release-distribution/_terraform.tf b/terragrunt/modules/release-distribution/_terraform.tf index 5e58ca315..47c2c0950 100644 --- a/terragrunt/modules/release-distribution/_terraform.tf +++ b/terragrunt/modules/release-distribution/_terraform.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.32" + version = "~> 5.64" } fastly = { source = "fastly/fastly" From dd16e1d8a228fefb009d0996e65a8f6b3f21d01e Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:41:54 +0200 Subject: [PATCH 177/217] update releases-prod deployed ref --- .../legacy/releases-prod/deployed-ref | 2 +- .../release-distribution/.terraform.lock.hcl | 34 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terragrunt/accounts/legacy/releases-prod/deployed-ref b/terragrunt/accounts/legacy/releases-prod/deployed-ref index 5047e66f7..2f50e8fec 100644 --- a/terragrunt/accounts/legacy/releases-prod/deployed-ref +++ b/terragrunt/accounts/legacy/releases-prod/deployed-ref @@ -1 +1 @@ -85122f530ed837cc0f8aa7c31e03b15cb1e3f015 +4288556792b72d55e7e6d0584bc37472644a4f57 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 fcf8a9e2c..9082ed516 100644 --- a/terragrunt/accounts/legacy/releases-prod/release-distribution/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/releases-prod/release-distribution/.terraform.lock.hcl @@ -24,25 +24,25 @@ provider "registry.terraform.io/fastly/fastly" { } provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20, ~> 4.32" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } From 77ea258296e76e4cbd4fb6770c4d38f3ce2fe602 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:34:10 +0200 Subject: [PATCH 178/217] chore(rustup-prod): update aws provider to 5.64 --- .../rustup-prod/rustup/.terraform.lock.hcl | 34 +++++++++---------- terragrunt/modules/rustup/_terraform.tf | 3 +- terragrunt/modules/rustup/cloudfront.tf | 2 +- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/terragrunt/accounts/legacy/rustup-prod/rustup/.terraform.lock.hcl b/terragrunt/accounts/legacy/rustup-prod/rustup/.terraform.lock.hcl index 777f97bd4..6a8362798 100644 --- a/terragrunt/accounts/legacy/rustup-prod/rustup/.terraform.lock.hcl +++ b/terragrunt/accounts/legacy/rustup-prod/rustup/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20" + version = "5.64.0" + constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/modules/rustup/_terraform.tf b/terragrunt/modules/rustup/_terraform.tf index 6e71aed42..05ae394e7 100644 --- a/terragrunt/modules/rustup/_terraform.tf +++ b/terragrunt/modules/rustup/_terraform.tf @@ -4,8 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.64" } } } - diff --git a/terragrunt/modules/rustup/cloudfront.tf b/terragrunt/modules/rustup/cloudfront.tf index 15a644033..e257e4eec 100644 --- a/terragrunt/modules/rustup/cloudfront.tf +++ b/terragrunt/modules/rustup/cloudfront.tf @@ -42,7 +42,7 @@ resource "aws_cloudfront_distribution" "builds" { origin { origin_id = "builds" - domain_name = aws_s3_bucket.builds.bucket_regional_domain_name + domain_name = aws_s3_bucket.builds.bucket_domain_name origin_access_control_id = aws_cloudfront_origin_access_control.builds.id } From 29bbead946ea3b6bfc92f1e801e13b94447971b7 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:48:45 +0200 Subject: [PATCH 179/217] chore(aws-organization): update aws to 5.64 --- .../root/aws-organization/.terraform.lock.hcl | 36 +++++++++---------- .../modules/aws-organization/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/terragrunt/accounts/root/aws-organization/.terraform.lock.hcl b/terragrunt/accounts/root/aws-organization/.terraform.lock.hcl index c33dc422e..bbf28555f 100644 --- a/terragrunt/accounts/root/aws-organization/.terraform.lock.hcl +++ b/terragrunt/accounts/root/aws-organization/.terraform.lock.hcl @@ -2,26 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.40.0" - constraints = "~> 4.32" + version = "5.64.0" + constraints = "~> 5.64" hashes = [ - "h1:YlsYrKClET1k7WDshRwEnB8slVJBuMHQum8K5owL+p4=", - "h1:ZNYcP0N4WfRiuCmkXJkPrTS/4BG7PfkbXBUhbA77WTg=", - "h1:wZ0mPxigFhz6C+0YUzI5vecGwya1PqlCGTSr6giqjvg=", - "zh:04ca7287b7f5a2a310b60308cc08df11e97714d32d1a10c34a94454d330af66e", - "zh:13c28ba9b324c526580783a3807007a296ce58c607c7bdc94ae2bb72b35b6495", - "zh:2c84dbc0701b9724802f7343f916f50b6914a044dfbfc6654f264c9347f02dac", - "zh:33255a22e1d1ecec2ad8ccfec1e4a54dc33a8d71f3edad098c25d822958a138b", - "zh:4583b5e92b8de3662c8d8ff8a6527572ec23ad8c64dd686ff9dd528bc6934a4f", - "zh:4a9f502c0b8abe45abda846e0601f8d8ef582e62e0b92cb747b4200a711ba739", - "zh:558959e19935ec5e7f0647e900fc8561f4961a377be0178496a6495805136721", - "zh:6b3dc4b034d34885db620d73c75d3bb9abeee539e61ca9d0670fb995353e165d", - "zh:72f0dac5dbba355bce88599ded2baabc7d109ee786b89c6648ae720cb00a4bbf", - "zh:77981b87e2bcbb278402e8ff863d5e50aafbdc03629d7a57273c06989884a22f", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:c5b4dd61558a4887a23847d23cd3b41a97ad03a9f3624d0687cb5461fee514b0", - "zh:c8949bc6600ec10ea5c0abdd4c1ffee8f82519c0cda8cc7a651e6258960e6249", - "zh:d1c88ab98f126d65cd0c7b6c9e1d06d59e766217ae374d5a908052817e3692a3", - "zh:ff2e921440bcbfd440ef84f5127ba881c930b2b70773e725de35c0fa3baddc4b", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } diff --git a/terragrunt/modules/aws-organization/_terraform.tf b/terragrunt/modules/aws-organization/_terraform.tf index 3f929c985..691e83008 100644 --- a/terragrunt/modules/aws-organization/_terraform.tf +++ b/terragrunt/modules/aws-organization/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.32" + version = "~> 5.64" } } } From 79023e41f9ce32b62419505409c0b6c2250b9df8 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:56:50 +0200 Subject: [PATCH 180/217] chore(sync-team-dns-zone): update aws to 5.64 --- .../dns-zone/.terraform.lock.hcl | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/terragrunt/accounts/sync-team-prod/dns-zone/.terraform.lock.hcl b/terragrunt/accounts/sync-team-prod/dns-zone/.terraform.lock.hcl index 4a2646794..250398d18 100644 --- a/terragrunt/accounts/sync-team-prod/dns-zone/.terraform.lock.hcl +++ b/terragrunt/accounts/sync-team-prod/dns-zone/.terraform.lock.hcl @@ -2,24 +2,23 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.46.0" + version = "5.64.0" hashes = [ - "h1:EZB4OgvytV38JpWyye9zoMQ0bfT9yB9xSXM5NY3Lrws=", - "h1:WFBUQj7XI7gknCtGR+3yDhdlUiDYrONOA8HA7h2yWqY=", - "zh:1678e6a4bdb3d81a6713adc62ca0fdb8250c584e10c10d1daca72316e9db8df2", - "zh:329903acf86ef6072502736dff4c43c2b50f762a958f76aa924e2d74c7fca1e3", - "zh:33db8131fe0ec7e1d9f30bc9f65c2440e9c1f708d681b6062757a351f1df7ce6", - "zh:3a3b010bc393784c16f4b6cdce7f76db93d5efa323fce4920bfea9e9ba6abe44", - "zh:979e2713a5759a7483a065e149e3cb69db9225326fc0457fa3fc3a48aed0c63f", + "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", + "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", + "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", + "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", + "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", + "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", + "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", + "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", + "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", + "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9efcf0067e16ad53da7504178a05eb2118770b4ae00c193c10ecad4cbfce308e", - "zh:a10655bf1b6376ab7f3e55efadf54dc70f7bd07ca11369557c312095076f9d62", - "zh:b0394dd42cbd2a718a7dd7ae0283f04769aaf8b3d52664e141da59c0171a11ab", - "zh:b958e614c2cf6d9c05a6ad5e94dc5c04b97ebfb84415da068be5a081b5ebbe24", - "zh:ba5069e624210c63ad9e633a8eb0108b21f2322bc4967ba2b82d09168c466888", - "zh:d7dfa597a17186e7f4d741dd7111849f1c0dd6f7ebc983043d8262d2fb37b408", - "zh:e8a641ca2c99f96d64fa2725875e797273984981d3e54772a2823541c44e3cd3", - "zh:f89898b7067c4246293a8007f59f5cfcac7b8dd251d39886c7a53ba596251466", - "zh:fb1e1df1d5cc208e08a850f8e84423bce080f01f5e901791c79df369d3ed52f2", + "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", + "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", + "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", + "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", + "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", ] } From f9d2b06d4ba9614ab09298910d6e69626df7bd89 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 28 Aug 2024 12:36:27 +0200 Subject: [PATCH 181/217] chore(fastly-tls-subscrition): update aws to 5.64 --- terragrunt/modules/fastly-tls-subscription/_terraform.tf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/terragrunt/modules/fastly-tls-subscription/_terraform.tf b/terragrunt/modules/fastly-tls-subscription/_terraform.tf index eb379e7b7..645a826aa 100644 --- a/terragrunt/modules/fastly-tls-subscription/_terraform.tf +++ b/terragrunt/modules/fastly-tls-subscription/_terraform.tf @@ -3,9 +3,8 @@ terraform { required_providers { aws = { - source = "hashicorp/aws" - // Allow both 4.x and 5.x while we upgrade everything to 5.x. - version = ">= 4.20, < 6" + source = "hashicorp/aws" + version = "~> 5.64" } fastly = { source = "fastly/fastly" From 21cd4793f53a1b88959be7f9e5092b1c0a3d4e1d Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:59:24 +0200 Subject: [PATCH 182/217] docs: document releases module Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> --- terraform/releases/README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 terraform/releases/README.md diff --git a/terraform/releases/README.md b/terraform/releases/README.md new file mode 100644 index 000000000..31ed3f542 --- /dev/null +++ b/terraform/releases/README.md @@ -0,0 +1,13 @@ +# Releases + +This module creates the infrastructure that publishes Rust releases. + +Releases are produced using the +[promote-release](https://github.com/rust-lang/promote-release) +tool, which runs on AWS CodeBuild. +Releases are stored in the AWS S3 bucket `static-rust-lang-org`. + +The `start-release` lambda allows the release team to trigger `promote-release` to start the release process. + +This module also manages the GPG keys used to sign releases. +The keys are stored in the encrypted AWS bucket `rust-release-keys`. From ea6e692c0b5f859a74d4d65b363688df7439123b Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 30 Aug 2024 11:27:03 +0200 Subject: [PATCH 183/217] docs: document release-distribution --- terragrunt/modules/release-distribution/README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 terragrunt/modules/release-distribution/README.md diff --git a/terragrunt/modules/release-distribution/README.md b/terragrunt/modules/release-distribution/README.md new file mode 100644 index 000000000..85899502b --- /dev/null +++ b/terragrunt/modules/release-distribution/README.md @@ -0,0 +1,13 @@ +# Release distribution + +This module creates the infrastructure that distributes Rust releases. + +Rust releases are distributed through the AWS S3 bucket `static-rust-lang-org`. +This bucket is served at `static.rust-lang.org` by CloudFront and Fastly CDNs. + +The terraform variables `static_cloudfront_weight` and `static_fastly_weight` control the +distribution of traffic between CloudFront and Fastly. + +If you want to use a specific CDN, use `fastly-static.rust-lang.org` or `cloudfront-static.rust-lang.org`. + +The Fastly CDN is configured via the VCL language, while the CloudFront CDN is configured via Javascript AWS lambda functions. From 25ea0d7253cb6f77621d28d39861fb4110a1ff62 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 30 Aug 2024 15:09:37 +0200 Subject: [PATCH 184/217] chore: update `terraform/releases` providers --- terraform/releases/.terraform.lock.hcl | 37 +++++++++++++------------- terraform/releases/_terraform.tf | 4 +-- terraform/releases/impl/main.tf | 2 +- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/terraform/releases/.terraform.lock.hcl b/terraform/releases/.terraform.lock.hcl index db23c7a19..d610ae309 100644 --- a/terraform/releases/.terraform.lock.hcl +++ b/terraform/releases/.terraform.lock.hcl @@ -2,33 +2,34 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.58.0" - constraints = ">= 4.20.0, ~> 5.58, < 6.0.0" + version = "5.65.0" + constraints = ">= 4.20.0, ~> 5.65, < 6.0.0" hashes = [ - "h1:6vsFc7SmmlElqg3k0X6azrO0yarM7UPCUF4XsAYryjA=", - "zh:15e9be54a8febe8e560362b10967cb60b680ca3f78fe207d7209b76e076f59d3", - "zh:240f6899a2cec259aa2729ce031f6af2b453f90a8b59118bb2571c54acc65db8", - "zh:2b6e8e2ab1a3dce1001503dba6086a128bb2a71652b0d0b3b107db665b7d6881", - "zh:579b0ed95247a0bd8bfb3fac7fb767547dde76026c578f4f184b5743af5e32cc", - "zh:6adcd10fd12be0be9eb78a89e745a5b77ae0d8b3522cd782456a71178aad8ccb", - "zh:7f829cef82f0a02faa97d0fbe1417a40b73fc5142e883b12eebc5b71015efac9", - "zh:81977f001998c9096f7b59710996e159774a9313c1bc03db3beb81c3e016ebef", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a5d98ac6fab6e6c85164ca7dd38f94a1e44bd70c0e8354c61f7fbabf698957cd", - "zh:c27fa4fed50f6f83ca911bef04f05d635a7b7a01a89dc8fc5d66a277588f08df", - "zh:d4042bdf86ca6dc10e0cca91c4fcc592b12572d26185b3d37bbbb9e2026ac68b", - "zh:d536482cf4ace0d49a2a86c931150921649beae59337d0c02a785879fe943cf3", - "zh:e205f8243274a621fb9ef2b5e2c71e84c1670be1d23697739439f5a831fa620f", - "zh:eb76ce0c77fd76c47f57122c91c4fcf0f72c01423538ed7833eaa7eeaae2edf6", - "zh:ffe04e494af6cc7348ceb8d85f4c1d5a847a44510827b4496513c810a4d9196d", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } provider "registry.terraform.io/hashicorp/external" { version = "2.3.3" - constraints = "~> 2.3.1" + constraints = "~> 2.3.3" hashes = [ "h1:H+3QlVPs/7CDa3I4KU/a23wYeGeJxeBlgvR7bfK1t1w=", + "h1:gShzO1rJtADK9tDZMvMgjciVAzsBh39LNjtThCwX1Hg=", "zh:03d81462f9578ec91ce8e26f887e34151eda0e100f57e9772dbea86363588239", "zh:37ec2a20f6a3ec3a0fd95d3f3de26da6cb9534b30488bc45723e118a0911c0d8", "zh:4eb5b119179539f2749ce9de0e1b9629d025990f062f4f4dddc161562bb89d37", diff --git a/terraform/releases/_terraform.tf b/terraform/releases/_terraform.tf index 83256808e..af8125573 100644 --- a/terraform/releases/_terraform.tf +++ b/terraform/releases/_terraform.tf @@ -6,11 +6,11 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.58" + version = "~> 5.65" } external = { source = "hashicorp/external" - version = "~> 2.3.1" + version = "~> 2.3.3" } } diff --git a/terraform/releases/impl/main.tf b/terraform/releases/impl/main.tf index 3963a11e2..49a346174 100644 --- a/terraform/releases/impl/main.tf +++ b/terraform/releases/impl/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.58" + version = "~> 5.65" configuration_aliases = [aws.east1] } } From de2ccf4fb4de6be055376200230841374a44b04e Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 30 Aug 2024 16:05:35 +0200 Subject: [PATCH 185/217] chore: update lambda terraform module Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> --- terraform/shared/modules/lambda/main.tf | 5 ++-- terraform/team-repo/.terraform.lock.hcl | 34 ++++++++++++------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/terraform/shared/modules/lambda/main.tf b/terraform/shared/modules/lambda/main.tf index ad3ecd6db..71f7daa58 100644 --- a/terraform/shared/modules/lambda/main.tf +++ b/terraform/shared/modules/lambda/main.tf @@ -1,9 +1,8 @@ terraform { required_providers { aws = { - source = "hashicorp/aws" - // Allow both 4.x and 5.x while we upgrade everything to 5.x. - version = ">= 4.20, < 6" + source = "hashicorp/aws" + version = ">= 5.64" } } } diff --git a/terraform/team-repo/.terraform.lock.hcl b/terraform/team-repo/.terraform.lock.hcl index d2a526dd7..f6e78b17f 100644 --- a/terraform/team-repo/.terraform.lock.hcl +++ b/terraform/team-repo/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" + version = "5.65.0" + constraints = ">= 5.64.0, ~> 5.64" hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } From 3efa06207b8d4323cfc67a2602f780de45f08151 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 30 Aug 2024 16:29:57 +0200 Subject: [PATCH 186/217] chore: update dev-desktops-prod providers --- .../resource-group/.terraform.lock.hcl | 60 +++++++++---------- .../westeurope/.terraform.lock.hcl | 60 +++++++++---------- .../westus2/.terraform.lock.hcl | 60 +++++++++---------- .../modules/dev-desktops-azure/_terraform.tf | 2 +- .../modules/dev-desktops-azure/instances.tf | 1 + terragrunt/modules/dev-desktops-azure/vpc.tf | 9 +-- .../modules/resource-group/_terraform.tf | 2 +- 7 files changed, 98 insertions(+), 96 deletions(-) diff --git a/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl index 468a46f0e..7e3c83e33 100644 --- a/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl @@ -2,43 +2,43 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.63.1" + version = "5.65.0" hashes = [ - "h1:Wu2MrBj79v8k4hMb8GKMu5p9KpVtCjNBsZ/R5wOTgZs=", - "zh:093adc21714d264005f66002464f4e9f48d6759adaaa88ca32db0c1134c2ca2b", - "zh:15505e01889d8da3e569ae3a8300cf12e8853822a5909a54eb07cf57f17daa74", - "zh:1c64ea9ab2c4a46a2e6eeafa4069106c1d9208aa2823264e58e826049b9417f7", - "zh:1ca7e98446f519f08ad684928b8bc22d480e419b6210955af8a31730d8dbc5ad", - "zh:3bd8fe53647e17fadcfe13536160009e4bb77e1c2fe224e991c82fb228ab4ece", - "zh:68d4bd6ffba3c6484c228a1756b1c7c16802ebd58a20b8d6bfb547d96a2eaa69", - "zh:68fbabfc04bde3655ded9919f5954ab8884a35d265d41aec53f95804e741ca7c", - "zh:69c2ea737c1cfb7252f22ca7a50d8cc7a4729ea288fc3833933c2380023ca605", - "zh:796caec3b4e8d177e5e4787d7b61a8a541993edc33db2c3ffffdfdbbad3967b5", - "zh:877a02805e1b4503b4e174a34084055873619af9d9e57e7098c27d0e0be0b592", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:d37f14e0807d73eff3a8384d694b4e770d41ae3286b5195927d9d809076a2d68", - "zh:e45279ca14b28647ac26dc8ca87f67da994f961e92ad316c9bc71be922c0a3fb", - "zh:e63eb4cc5b78319a26120bdce985f44ac4b1e71e43abac0eca4eaceb0af570f5", - "zh:f5c12695fcd777825434aa7aa560b6e1d851f823d75fda7c9df5c177071720a5", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.116.0" - constraints = "3.116.0" + version = "4.0.1" + constraints = "4.0.1" hashes = [ - "h1:BCR3NIorFSvGG3v/+JOiiw3VM4PkChLO4m84wzD9NDo=", - "zh:02b6606aff025fc2a962b3e568e000300abe959adac987183c24dac8eb057f4d", - "zh:2a23a8ce24ff9e885925ffee0c3ea7eadba7a702541d05869275778aa47bdea7", - "zh:57d10746384baeca4d5c56e88872727cdc150f437b8c5e14f0542127f7475e24", - "zh:59e3ebde1a2e1e094c671e179f231ead60684390dbf02d2b1b7fe67a228daa1a", - "zh:5f1f5c7d09efa2ee8ddf21bd9efbbf8286f6e90047556bef305c062fa0ac5880", - "zh:a40646aee3c9907276dab926e6123a8d70b1e56174836d4c59a9992034f88d70", - "zh:c21d40461bc5836cf56ad3d93d2fc47f61138574a55e972ad5ff1cb73bab66dc", - "zh:c56fb91a5ae66153ba0f737a26da1b3d4f88fdef7d41c63e06c5772d93b26953", - "zh:d1e60e85f51d12fc150aeab8e31d3f18f859c32f927f99deb5b74cb1e10087aa", - "zh:ed35e727e7d79e687cd3d148f52b442961ede286e7c5b4da1dcd9f0128009466", + "h1:cbblXI9nw+Hp6T2E0tjfYU570kLpiqBKV+dJHQGa3a4=", + "zh:0e78a9200eef138d08050aab99c4fb9ab99c7c5ccbdd410592db7acc5ed421fe", + "zh:443157ba089ef4002817c4f3b3610654588084c2d8c8cf00f1ddf708c7c73411", + "zh:563595dd72b894b2ef9825226c04689ea9967113568a06077960cd863b3afa36", + "zh:5bef3c6bc8306b607078a09c3ab1d2ee55435e0099eedca459aca6c259c29079", + "zh:5eb305ca10a14a5cf5308e7225779f9f4152d5a8dd842c901fa47fc93432b346", + "zh:6041a5272b293ae95b46a39ceced3f14bf267a379263c10d11301c50c2e740d0", + "zh:7b077b9358ef6878d0520febcf17ba651eda6636c66885c925ae27d20df6d575", + "zh:8a140a1f8eb35a5ab5b5d3d46759d45408ad14dc5ca3f7fc9af5dc5cf1bb2133", + "zh:9a9d707dbd3b111a28e914a277e1e1076221a41194f7eaa0389e0b4a9b4033e4", + "zh:e8c42fb6cde74ecae1fe0a5fd9bb4bd804a5441f8dfec9d3cb4966af2054ede4", + "zh:eb018fe31c8e6f3e495bd79c7b278aa7dc51b48453f6b83bdb0e7b13459b2aa0", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:f6d2a4e7c58f44e7d04a4a9c73f35ed452f412c97c85def68c4b52814cbe03ab", ] } diff --git a/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl index 6ef2310db..575d34e26 100644 --- a/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl @@ -2,44 +2,44 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.63.1" + version = "5.65.0" hashes = [ - "h1:Wu2MrBj79v8k4hMb8GKMu5p9KpVtCjNBsZ/R5wOTgZs=", - "zh:093adc21714d264005f66002464f4e9f48d6759adaaa88ca32db0c1134c2ca2b", - "zh:15505e01889d8da3e569ae3a8300cf12e8853822a5909a54eb07cf57f17daa74", - "zh:1c64ea9ab2c4a46a2e6eeafa4069106c1d9208aa2823264e58e826049b9417f7", - "zh:1ca7e98446f519f08ad684928b8bc22d480e419b6210955af8a31730d8dbc5ad", - "zh:3bd8fe53647e17fadcfe13536160009e4bb77e1c2fe224e991c82fb228ab4ece", - "zh:68d4bd6ffba3c6484c228a1756b1c7c16802ebd58a20b8d6bfb547d96a2eaa69", - "zh:68fbabfc04bde3655ded9919f5954ab8884a35d265d41aec53f95804e741ca7c", - "zh:69c2ea737c1cfb7252f22ca7a50d8cc7a4729ea288fc3833933c2380023ca605", - "zh:796caec3b4e8d177e5e4787d7b61a8a541993edc33db2c3ffffdfdbbad3967b5", - "zh:877a02805e1b4503b4e174a34084055873619af9d9e57e7098c27d0e0be0b592", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:d37f14e0807d73eff3a8384d694b4e770d41ae3286b5195927d9d809076a2d68", - "zh:e45279ca14b28647ac26dc8ca87f67da994f961e92ad316c9bc71be922c0a3fb", - "zh:e63eb4cc5b78319a26120bdce985f44ac4b1e71e43abac0eca4eaceb0af570f5", - "zh:f5c12695fcd777825434aa7aa560b6e1d851f823d75fda7c9df5c177071720a5", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.116.0" - constraints = "3.116.0" + version = "4.0.1" + constraints = "4.0.1" hashes = [ - "h1:BCR3NIorFSvGG3v/+JOiiw3VM4PkChLO4m84wzD9NDo=", - "zh:02b6606aff025fc2a962b3e568e000300abe959adac987183c24dac8eb057f4d", - "zh:2a23a8ce24ff9e885925ffee0c3ea7eadba7a702541d05869275778aa47bdea7", - "zh:57d10746384baeca4d5c56e88872727cdc150f437b8c5e14f0542127f7475e24", - "zh:59e3ebde1a2e1e094c671e179f231ead60684390dbf02d2b1b7fe67a228daa1a", - "zh:5f1f5c7d09efa2ee8ddf21bd9efbbf8286f6e90047556bef305c062fa0ac5880", - "zh:a40646aee3c9907276dab926e6123a8d70b1e56174836d4c59a9992034f88d70", - "zh:c21d40461bc5836cf56ad3d93d2fc47f61138574a55e972ad5ff1cb73bab66dc", - "zh:c56fb91a5ae66153ba0f737a26da1b3d4f88fdef7d41c63e06c5772d93b26953", - "zh:d1e60e85f51d12fc150aeab8e31d3f18f859c32f927f99deb5b74cb1e10087aa", - "zh:ed35e727e7d79e687cd3d148f52b442961ede286e7c5b4da1dcd9f0128009466", + "h1:cbblXI9nw+Hp6T2E0tjfYU570kLpiqBKV+dJHQGa3a4=", + "zh:0e78a9200eef138d08050aab99c4fb9ab99c7c5ccbdd410592db7acc5ed421fe", + "zh:443157ba089ef4002817c4f3b3610654588084c2d8c8cf00f1ddf708c7c73411", + "zh:563595dd72b894b2ef9825226c04689ea9967113568a06077960cd863b3afa36", + "zh:5bef3c6bc8306b607078a09c3ab1d2ee55435e0099eedca459aca6c259c29079", + "zh:5eb305ca10a14a5cf5308e7225779f9f4152d5a8dd842c901fa47fc93432b346", + "zh:6041a5272b293ae95b46a39ceced3f14bf267a379263c10d11301c50c2e740d0", + "zh:7b077b9358ef6878d0520febcf17ba651eda6636c66885c925ae27d20df6d575", + "zh:8a140a1f8eb35a5ab5b5d3d46759d45408ad14dc5ca3f7fc9af5dc5cf1bb2133", + "zh:9a9d707dbd3b111a28e914a277e1e1076221a41194f7eaa0389e0b4a9b4033e4", + "zh:e8c42fb6cde74ecae1fe0a5fd9bb4bd804a5441f8dfec9d3cb4966af2054ede4", + "zh:eb018fe31c8e6f3e495bd79c7b278aa7dc51b48453f6b83bdb0e7b13459b2aa0", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:f6d2a4e7c58f44e7d04a4a9c73f35ed452f412c97c85def68c4b52814cbe03ab", ] } diff --git a/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl index 6ef2310db..575d34e26 100644 --- a/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl +++ b/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl @@ -2,44 +2,44 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.63.1" + version = "5.65.0" hashes = [ - "h1:Wu2MrBj79v8k4hMb8GKMu5p9KpVtCjNBsZ/R5wOTgZs=", - "zh:093adc21714d264005f66002464f4e9f48d6759adaaa88ca32db0c1134c2ca2b", - "zh:15505e01889d8da3e569ae3a8300cf12e8853822a5909a54eb07cf57f17daa74", - "zh:1c64ea9ab2c4a46a2e6eeafa4069106c1d9208aa2823264e58e826049b9417f7", - "zh:1ca7e98446f519f08ad684928b8bc22d480e419b6210955af8a31730d8dbc5ad", - "zh:3bd8fe53647e17fadcfe13536160009e4bb77e1c2fe224e991c82fb228ab4ece", - "zh:68d4bd6ffba3c6484c228a1756b1c7c16802ebd58a20b8d6bfb547d96a2eaa69", - "zh:68fbabfc04bde3655ded9919f5954ab8884a35d265d41aec53f95804e741ca7c", - "zh:69c2ea737c1cfb7252f22ca7a50d8cc7a4729ea288fc3833933c2380023ca605", - "zh:796caec3b4e8d177e5e4787d7b61a8a541993edc33db2c3ffffdfdbbad3967b5", - "zh:877a02805e1b4503b4e174a34084055873619af9d9e57e7098c27d0e0be0b592", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:d37f14e0807d73eff3a8384d694b4e770d41ae3286b5195927d9d809076a2d68", - "zh:e45279ca14b28647ac26dc8ca87f67da994f961e92ad316c9bc71be922c0a3fb", - "zh:e63eb4cc5b78319a26120bdce985f44ac4b1e71e43abac0eca4eaceb0af570f5", - "zh:f5c12695fcd777825434aa7aa560b6e1d851f823d75fda7c9df5c177071720a5", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.116.0" - constraints = "3.116.0" + version = "4.0.1" + constraints = "4.0.1" hashes = [ - "h1:BCR3NIorFSvGG3v/+JOiiw3VM4PkChLO4m84wzD9NDo=", - "zh:02b6606aff025fc2a962b3e568e000300abe959adac987183c24dac8eb057f4d", - "zh:2a23a8ce24ff9e885925ffee0c3ea7eadba7a702541d05869275778aa47bdea7", - "zh:57d10746384baeca4d5c56e88872727cdc150f437b8c5e14f0542127f7475e24", - "zh:59e3ebde1a2e1e094c671e179f231ead60684390dbf02d2b1b7fe67a228daa1a", - "zh:5f1f5c7d09efa2ee8ddf21bd9efbbf8286f6e90047556bef305c062fa0ac5880", - "zh:a40646aee3c9907276dab926e6123a8d70b1e56174836d4c59a9992034f88d70", - "zh:c21d40461bc5836cf56ad3d93d2fc47f61138574a55e972ad5ff1cb73bab66dc", - "zh:c56fb91a5ae66153ba0f737a26da1b3d4f88fdef7d41c63e06c5772d93b26953", - "zh:d1e60e85f51d12fc150aeab8e31d3f18f859c32f927f99deb5b74cb1e10087aa", - "zh:ed35e727e7d79e687cd3d148f52b442961ede286e7c5b4da1dcd9f0128009466", + "h1:cbblXI9nw+Hp6T2E0tjfYU570kLpiqBKV+dJHQGa3a4=", + "zh:0e78a9200eef138d08050aab99c4fb9ab99c7c5ccbdd410592db7acc5ed421fe", + "zh:443157ba089ef4002817c4f3b3610654588084c2d8c8cf00f1ddf708c7c73411", + "zh:563595dd72b894b2ef9825226c04689ea9967113568a06077960cd863b3afa36", + "zh:5bef3c6bc8306b607078a09c3ab1d2ee55435e0099eedca459aca6c259c29079", + "zh:5eb305ca10a14a5cf5308e7225779f9f4152d5a8dd842c901fa47fc93432b346", + "zh:6041a5272b293ae95b46a39ceced3f14bf267a379263c10d11301c50c2e740d0", + "zh:7b077b9358ef6878d0520febcf17ba651eda6636c66885c925ae27d20df6d575", + "zh:8a140a1f8eb35a5ab5b5d3d46759d45408ad14dc5ca3f7fc9af5dc5cf1bb2133", + "zh:9a9d707dbd3b111a28e914a277e1e1076221a41194f7eaa0389e0b4a9b4033e4", + "zh:e8c42fb6cde74ecae1fe0a5fd9bb4bd804a5441f8dfec9d3cb4966af2054ede4", + "zh:eb018fe31c8e6f3e495bd79c7b278aa7dc51b48453f6b83bdb0e7b13459b2aa0", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:f6d2a4e7c58f44e7d04a4a9c73f35ed452f412c97c85def68c4b52814cbe03ab", ] } diff --git a/terragrunt/modules/dev-desktops-azure/_terraform.tf b/terragrunt/modules/dev-desktops-azure/_terraform.tf index 89db8d2a4..622775e92 100644 --- a/terragrunt/modules/dev-desktops-azure/_terraform.tf +++ b/terragrunt/modules/dev-desktops-azure/_terraform.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.116.0" + version = "4.0.1" } } } diff --git a/terragrunt/modules/dev-desktops-azure/instances.tf b/terragrunt/modules/dev-desktops-azure/instances.tf index d7938b090..30475e0c5 100644 --- a/terragrunt/modules/dev-desktops-azure/instances.tf +++ b/terragrunt/modules/dev-desktops-azure/instances.tf @@ -6,6 +6,7 @@ resource "azurerm_public_ip" "v4" { location = var.location allocation_method = "Dynamic" domain_name_label = each.key + sku = "Basic" tags = { Name = "dev-desktops" diff --git a/terragrunt/modules/dev-desktops-azure/vpc.tf b/terragrunt/modules/dev-desktops-azure/vpc.tf index c7fdae276..b35571d6c 100644 --- a/terragrunt/modules/dev-desktops-azure/vpc.tf +++ b/terragrunt/modules/dev-desktops-azure/vpc.tf @@ -14,8 +14,9 @@ resource "azurerm_virtual_network" "dev_desktops" { } resource "azurerm_subnet" "internal" { - name = "internal" - resource_group_name = var.resource_group_name - virtual_network_name = azurerm_virtual_network.dev_desktops.name - address_prefixes = [cidrsubnet(local.address_space, 8, 1)] + name = "internal" + resource_group_name = var.resource_group_name + virtual_network_name = azurerm_virtual_network.dev_desktops.name + address_prefixes = [cidrsubnet(local.address_space, 8, 1)] + private_endpoint_network_policies = "Enabled" } diff --git a/terragrunt/modules/resource-group/_terraform.tf b/terragrunt/modules/resource-group/_terraform.tf index 9eeb37052..086fad045 100644 --- a/terragrunt/modules/resource-group/_terraform.tf +++ b/terragrunt/modules/resource-group/_terraform.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.116.0" + version = "4.0.1" } } } From fca31025dc4cd84a2921352be31b927260fd2676 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 2 Sep 2024 14:17:36 +0200 Subject: [PATCH 187/217] chore(rustc-perf): update aws terraform provider from 3.59 to 4.67 --- terraform/rustc-perf/.terraform.lock.hcl | 32 +++++++++++++----------- terraform/rustc-perf/_terraform.tf | 10 +++----- terraform/rustc-perf/s3.tf | 25 ++++++++++++++++++ 3 files changed, 47 insertions(+), 20 deletions(-) diff --git a/terraform/rustc-perf/.terraform.lock.hcl b/terraform/rustc-perf/.terraform.lock.hcl index de6a41780..77adfed63 100644 --- a/terraform/rustc-perf/.terraform.lock.hcl +++ b/terraform/rustc-perf/.terraform.lock.hcl @@ -2,20 +2,24 @@ # 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, ~> 4.28" 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", + "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/terraform/rustc-perf/_terraform.tf b/terraform/rustc-perf/_terraform.tf index 5bd82ca42..5a55023e4 100644 --- a/terraform/rustc-perf/_terraform.tf +++ b/terraform/rustc-perf/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 3.59" + version = "~> 4.67" } } @@ -29,12 +29,10 @@ data "terraform_remote_state" "shared" { } provider "aws" { - profile = "default" - region = "us-west-1" + region = "us-west-1" } provider "aws" { - profile = "default" - region = "us-east-1" - alias = "east1" + region = "us-east-1" + alias = "east1" } diff --git a/terraform/rustc-perf/s3.tf b/terraform/rustc-perf/s3.tf index 82abb7c77..1afab9075 100644 --- a/terraform/rustc-perf/s3.tf +++ b/terraform/rustc-perf/s3.tf @@ -7,6 +7,31 @@ module "static_website" { domain_name = "perf-data.rust-lang.org" origin_domain_name = aws_s3_bucket.bucket.bucket_regional_domain_name origin_access_identity = aws_cloudfront_origin_access_identity.bucket.cloudfront_access_identity_path + response_policy_id = aws_cloudfront_response_headers_policy.response_policy.id +} + +resource "aws_cloudfront_response_headers_policy" "response_policy" { + name = "RustcPerfPolicy" + comment = "Policy for RustcPerf website" + + security_headers_config { + content_type_options { + override = true + } + frame_options { + frame_option = "DENY" + override = true + } + xss_protection { + protection = true + mode_block = true + override = true + } + referrer_policy { + referrer_policy = "no-referrer" + override = true + } + } } resource "aws_iam_user" "s3" { From 7fd1d459468d8c699b68336b1f060c31d07391d1 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 2 Sep 2024 14:47:08 +0200 Subject: [PATCH 188/217] chore: update terragrunt sync-team providers Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> --- .../sync-team/.terraform.lock.hcl | 137 ++++++++---------- terragrunt/modules/sync-team/_terraform.tf | 4 +- 2 files changed, 61 insertions(+), 80 deletions(-) diff --git a/terragrunt/accounts/sync-team-prod/sync-team/.terraform.lock.hcl b/terragrunt/accounts/sync-team-prod/sync-team/.terraform.lock.hcl index a0cb3013b..064fdd1ff 100644 --- a/terragrunt/accounts/sync-team-prod/sync-team/.terraform.lock.hcl +++ b/terragrunt/accounts/sync-team-prod/sync-team/.terraform.lock.hcl @@ -2,105 +2,85 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.58.0" - constraints = "~> 4.20, >= 4.54.0" + version = "5.65.0" + constraints = ">= 4.20.0, >= 5.32.0, ~> 5.32, < 6.0.0" hashes = [ - "h1:xXjZy36R+YOFyLjuF+rgi0NDLwnkFwrJ2t9NfsjRM/E=", - "zh:14b2b2dfbc7ee705c412d762b1485ee08958c816a64ac74f5769e946e4a1d265", - "zh:17a37e6825e2023b18987d31c0cbb9336654ea146b68e6c90710ea4636af71ae", - "zh:273127c69fb244577e5c136c46164d34f77b0c956c18d27f63d1072dd558f924", - "zh:4b2b6416d34fb3e1051c99d2a84045b136976140e34381d5fbf90e32db15272e", - "zh:7e6a8571ff15d51f892776265642ee01004b8553fd4f6f2014b6f3f2834670c7", - "zh:847c76ab2381b66666d0f79cf1ac697b5bfd0d9c3009fd11bc6ad6545d1eb427", - "zh:9a52cae08ba8d27d0639a8d2b8c61591027883058bf0cc5a639cffe1e299f019", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9df647e8322d6f94f1843366ba39d21c4b36c8e7dcdc03711d52e27f73b0e974", - "zh:9e52037e68409802ff913b166c30e3f2035af03865cbef0c1b03762bce853941", - "zh:a30288e7c3c904d6998d1709835d7c5800a739f8608f0837f960286a2b8b6e59", - "zh:a7f24e3bda3be566468e4ad62cef1016f68c6f5a94d2e3e979485bc05626281b", - "zh:ba326ba80f5e39829b67a6d1ce54ba52b171e5e13a0a91ef5f9170a9b0cc9ce4", - "zh:c4e3fe9f2be6e244a3dfce599f4b0be9e8fffaece64cbc65f3195f825f65489b", - "zh:f20a251af37039bb2c7612dbd2c5df3a25886b4cc78f902385a2850ea6e30d08", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } provider "registry.terraform.io/hashicorp/external" { - version = "1.2.0" - constraints = ">= 1.0.0, ~> 1.2.0" + version = "2.3.3" + constraints = ">= 1.0.0, ~> 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/hashicorp/local" { - version = "2.4.0" + version = "2.5.1" constraints = ">= 1.0.0" hashes = [ - "h1:R97FTYETo88sT2VHfMgkPU3lzCsZLunPftjSI5vfKe8=", - "zh:53604cd29cb92538668fe09565c739358dc53ca56f9f11312b9d7de81e48fab9", - "zh:66a46e9c508716a1c98efbf793092f03d50049fa4a83cd6b2251e9a06aca2acf", - "zh:70a6f6a852dd83768d0778ce9817d81d4b3f073fab8fa570bff92dcb0824f732", + "h1:/GAVA/xheGQcbOZEq0qxANOg+KVLCA7Wv8qluxhTjhU=", + "zh:0af29ce2b7b5712319bf6424cb58d13b852bf9a777011a545fac99c7fdcdf561", + "zh:126063ea0d79dad1f68fa4e4d556793c0108ce278034f101d1dbbb2463924561", + "zh:196bfb49086f22fd4db46033e01655b0e5e036a5582d250412cc690fa7995de5", + "zh:37c92ec084d059d37d6cffdb683ccf68e3a5f8d2eb69dd73c8e43ad003ef8d24", + "zh:4269f01a98513651ad66763c16b268f4c2da76cc892ccfd54b401fff6cc11667", + "zh:51904350b9c728f963eef0c28f1d43e73d010333133eb7f30999a8fb6a0cc3d8", + "zh:73a66611359b83d0c3fcba2984610273f7954002febb8a57242bbb86d967b635", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:82a803f2f484c8b766e2e9c32343e9c89b91997b9f8d2697f9f3837f62926b35", - "zh:9708a4e40d6cc4b8afd1352e5186e6e1502f6ae599867c120967aebe9d90ed04", - "zh:973f65ce0d67c585f4ec250c1e634c9b22d9c4288b484ee2a871d7fa1e317406", - "zh:c8fa0f98f9316e4cfef082aa9b785ba16e36ff754d6aba8b456dab9500e671c6", - "zh:cfa5342a5f5188b20db246c73ac823918c189468e1382cb3c48a9c0c08fc5bf7", - "zh:e0e2b477c7e899c63b06b38cd8684a893d834d6d0b5e9b033cedc06dd7ffe9e2", - "zh:f62d7d05ea1ee566f732505200ab38d94315a4add27947a60afa29860822d3fc", - "zh:fa7ce69dde358e172bd719014ad637634bbdabc49363104f4fca759b4b73f2ce", + "zh:7ae387993a92bcc379063229b3cce8af7eaf082dd9306598fcd42352994d2de0", + "zh:9e0f365f807b088646db6e4a8d4b188129d9ebdbcf2568c8ab33bddd1b82c867", + "zh:b5263acbd8ae51c9cbffa79743fbcadcb7908057c87eb22fd9048268056efbc4", + "zh:dfcd88ac5f13c0d04e24be00b686d069b4879cc4add1b7b1a8ae545783d97520", ] } provider "registry.terraform.io/hashicorp/null" { - version = "3.2.1" + version = "3.2.2" constraints = ">= 2.0.0" hashes = [ - "h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=", - "zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840", - "zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb", - "zh:63cff4de03af983175a7e37e52d4bd89d990be256b16b5c7f919aff5ad485aa5", - "zh:74cb22c6700e48486b7cabefa10b33b801dfcab56f1a6ac9b6624531f3d36ea3", + "h1:IMVAUHKoydFrlPrl9OzasDnw/8ntZFerCC9iXw1rXQY=", + "zh:3248aae6a2198f3ec8394218d05bd5e42be59f43a3a7c0b71c66ec0df08b69e7", + "zh:32b1aaa1c3013d33c245493f4a65465eab9436b454d250102729321a44c8ab9a", + "zh:38eff7e470acb48f66380a73a5c7cdd76cc9b9c9ba9a7249c7991488abe22fe3", + "zh:4c2f1faee67af104f5f9e711c4574ff4d298afaa8a420680b0cb55d7bbc65606", + "zh:544b33b757c0b954dbb87db83a5ad921edd61f02f1dc86c6186a5ea86465b546", + "zh:696cf785090e1e8cf1587499516b0494f47413b43cb99877ad97f5d0de3dc539", + "zh:6e301f34757b5d265ae44467d95306d61bef5e41930be1365f5a8dcf80f59452", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:79e553aff77f1cfa9012a2218b8238dd672ea5e1b2924775ac9ac24d2a75c238", - "zh:a1e06ddda0b5ac48f7e7c7d59e1ab5a4073bbcf876c73c0299e4610ed53859dc", - "zh:c37a97090f1a82222925d45d84483b2aa702ef7ab66532af6cbcfb567818b970", - "zh:e4453fbebf90c53ca3323a92e7ca0f9961427d2f0ce0d2b65523cc04d5d999c2", - "zh:e80a746921946d8b6761e77305b752ad188da60688cfd2059322875d363be5f5", - "zh:fbdb892d9822ed0e4cb60f2fedbdbb556e4da0d88d3b942ae963ed6ff091e48f", - "zh:fca01a623d90d0cad0843102f9b8b9fe0d3ff8244593bd817f126582b52dd694", - ] -} - -provider "registry.terraform.io/hashicorp/tls" { - version = "4.0.4" - constraints = "~> 4.0" - hashes = [ - "h1:pe9vq86dZZKCm+8k1RhzARwENslF3SXb9ErHbQfgjXU=", - "zh:23671ed83e1fcf79745534841e10291bbf34046b27d6e68a5d0aab77206f4a55", - "zh:45292421211ffd9e8e3eb3655677700e3c5047f71d8f7650d2ce30242335f848", - "zh:59fedb519f4433c0fdb1d58b27c210b27415fddd0cd73c5312530b4309c088be", - "zh:5a8eec2409a9ff7cd0758a9d818c74bcba92a240e6c5e54b99df68fff312bbd5", - "zh:5e6a4b39f3171f53292ab88058a59e64825f2b842760a4869e64dc1dc093d1fe", - "zh:810547d0bf9311d21c81cc306126d3547e7bd3f194fc295836acf164b9f8424e", - "zh:824a5f3617624243bed0259d7dd37d76017097dc3193dac669be342b90b2ab48", - "zh:9361ccc7048be5dcbc2fafe2d8216939765b3160bd52734f7a9fd917a39ecbd8", - "zh:aa02ea625aaf672e649296bce7580f62d724268189fe9ad7c1b36bb0fa12fa60", - "zh:c71b4cd40d6ec7815dfeefd57d88bc592c0c42f5e5858dcc88245d371b4b8b1e", - "zh:dabcd52f36b43d250a3d71ad7abfa07b5622c69068d989e60b79b2bb4f220316", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:913a929070c819e59e94bb37a2a253c228f83921136ff4a7aa1a178c7cce5422", + "zh:aa9015926cd152425dbf86d1abdbc74bfe0e1ba3d26b3db35051d7b9ca9f72ae", + "zh:bb04798b016e1e1d49bcc76d62c53b56c88c63d6f2dfe38821afef17c416a0e1", + "zh:c23084e1b23577de22603cff752e59128d83cfecc2e6819edadd8cf7a10af11e", ] } @@ -108,6 +88,7 @@ provider "registry.terraform.io/integrations/github" { version = "4.31.0" constraints = "~> 4.14" hashes = [ + "h1:FkBft5JlVtlcYcEM0CiphlFWgjBFQVziJMwrowuBIoc=", "h1:nO3MyFnQToKUSIImFS2ib7RAMOy02Me6Up4qGBvdKMw=", "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", "zh:0dca3802a7ea1ba4812c866bf202e62aef6c8995db8856fdb5b4d1d81b505518", diff --git a/terragrunt/modules/sync-team/_terraform.tf b/terragrunt/modules/sync-team/_terraform.tf index 710a01518..106c092c1 100644 --- a/terragrunt/modules/sync-team/_terraform.tf +++ b/terragrunt/modules/sync-team/_terraform.tf @@ -6,11 +6,11 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.65" } external = { source = "hashicorp/external" - version = "~> 1.2.0" + version = "~> 2.3.3" } github = { source = "integrations/github" From 619f870dcea9212cc53de73a5ff60da5f099e3ea Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:09:15 +0200 Subject: [PATCH 189/217] chore(rustc-perf): update to aws 5.65 Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> --- terraform/rustc-perf/.terraform.lock.hcl | 34 ++++++++++++------------ terraform/rustc-perf/_terraform.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/rustc-perf/.terraform.lock.hcl b/terraform/rustc-perf/.terraform.lock.hcl index 77adfed63..10d545177 100644 --- a/terraform/rustc-perf/.terraform.lock.hcl +++ b/terraform/rustc-perf/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20, ~> 4.28" + version = "5.65.0" + constraints = ">= 4.20.0, >= 4.28.0, ~> 5.65, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } diff --git a/terraform/rustc-perf/_terraform.tf b/terraform/rustc-perf/_terraform.tf index 5a55023e4..782620cf1 100644 --- a/terraform/rustc-perf/_terraform.tf +++ b/terraform/rustc-perf/_terraform.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.67" + version = "~> 5.65" } } From 401b5c0a37a8200a40ec7dc59cc99761d57adc58 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:11:36 +0200 Subject: [PATCH 190/217] fix(ci): don't run checks twice on PRs Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ab6f1fd9e..0d9f55586 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,8 @@ -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: jobs: rust: From 8be3557275c02d486cc4497fc3e5f99847235117 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:40:43 +0000 Subject: [PATCH 191/217] chore(deps): bump openssl from 0.10.60 to 0.10.66 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.60 to 0.10.66. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.60...openssl-v0.10.66) --- updated-dependencies: - dependency-name: openssl dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 50d37dd49..1a8961670 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -699,9 +699,9 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -731,9 +731,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.96" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", From fb4eade833997074d55ea35bf437ac53ad7f9307 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:18:20 +0200 Subject: [PATCH 192/217] chore: delete `sync-team-prod/sync-team` --- .../sync-team/.terraform.lock.hcl | 108 ---------- .../sync-team-prod/sync-team/terragrunt.hcl | 8 - terragrunt/modules/sync-team/_terraform.tf | 29 --- terragrunt/modules/sync-team/ci.tf | 101 --------- terragrunt/modules/sync-team/confirmation.tf | 132 ------------ .../lambdas/start-sync-team/index.js | 8 - .../lambdas/sync-team-confirmation/index.py | 131 ------------ terragrunt/modules/sync-team/sync-team.tf | 192 ------------------ 8 files changed, 709 deletions(-) delete mode 100644 terragrunt/accounts/sync-team-prod/sync-team/.terraform.lock.hcl delete mode 100644 terragrunt/accounts/sync-team-prod/sync-team/terragrunt.hcl delete mode 100644 terragrunt/modules/sync-team/_terraform.tf delete mode 100644 terragrunt/modules/sync-team/ci.tf delete mode 100644 terragrunt/modules/sync-team/confirmation.tf delete mode 100644 terragrunt/modules/sync-team/lambdas/start-sync-team/index.js delete mode 100644 terragrunt/modules/sync-team/lambdas/sync-team-confirmation/index.py delete mode 100644 terragrunt/modules/sync-team/sync-team.tf diff --git a/terragrunt/accounts/sync-team-prod/sync-team/.terraform.lock.hcl b/terragrunt/accounts/sync-team-prod/sync-team/.terraform.lock.hcl deleted file mode 100644 index 064fdd1ff..000000000 --- a/terragrunt/accounts/sync-team-prod/sync-team/.terraform.lock.hcl +++ /dev/null @@ -1,108 +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 = "5.65.0" - constraints = ">= 4.20.0, >= 5.32.0, ~> 5.32, < 6.0.0" - hashes = [ - "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", - "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", - "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", - "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", - "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", - "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", - "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", - "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", - "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", - "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", - "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", - "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", - "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", - "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", - ] -} - -provider "registry.terraform.io/hashicorp/external" { - version = "2.3.3" - constraints = ">= 1.0.0, ~> 2.3.3" - hashes = [ - "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/hashicorp/local" { - version = "2.5.1" - constraints = ">= 1.0.0" - hashes = [ - "h1:/GAVA/xheGQcbOZEq0qxANOg+KVLCA7Wv8qluxhTjhU=", - "zh:0af29ce2b7b5712319bf6424cb58d13b852bf9a777011a545fac99c7fdcdf561", - "zh:126063ea0d79dad1f68fa4e4d556793c0108ce278034f101d1dbbb2463924561", - "zh:196bfb49086f22fd4db46033e01655b0e5e036a5582d250412cc690fa7995de5", - "zh:37c92ec084d059d37d6cffdb683ccf68e3a5f8d2eb69dd73c8e43ad003ef8d24", - "zh:4269f01a98513651ad66763c16b268f4c2da76cc892ccfd54b401fff6cc11667", - "zh:51904350b9c728f963eef0c28f1d43e73d010333133eb7f30999a8fb6a0cc3d8", - "zh:73a66611359b83d0c3fcba2984610273f7954002febb8a57242bbb86d967b635", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:7ae387993a92bcc379063229b3cce8af7eaf082dd9306598fcd42352994d2de0", - "zh:9e0f365f807b088646db6e4a8d4b188129d9ebdbcf2568c8ab33bddd1b82c867", - "zh:b5263acbd8ae51c9cbffa79743fbcadcb7908057c87eb22fd9048268056efbc4", - "zh:dfcd88ac5f13c0d04e24be00b686d069b4879cc4add1b7b1a8ae545783d97520", - ] -} - -provider "registry.terraform.io/hashicorp/null" { - version = "3.2.2" - constraints = ">= 2.0.0" - hashes = [ - "h1:IMVAUHKoydFrlPrl9OzasDnw/8ntZFerCC9iXw1rXQY=", - "zh:3248aae6a2198f3ec8394218d05bd5e42be59f43a3a7c0b71c66ec0df08b69e7", - "zh:32b1aaa1c3013d33c245493f4a65465eab9436b454d250102729321a44c8ab9a", - "zh:38eff7e470acb48f66380a73a5c7cdd76cc9b9c9ba9a7249c7991488abe22fe3", - "zh:4c2f1faee67af104f5f9e711c4574ff4d298afaa8a420680b0cb55d7bbc65606", - "zh:544b33b757c0b954dbb87db83a5ad921edd61f02f1dc86c6186a5ea86465b546", - "zh:696cf785090e1e8cf1587499516b0494f47413b43cb99877ad97f5d0de3dc539", - "zh:6e301f34757b5d265ae44467d95306d61bef5e41930be1365f5a8dcf80f59452", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:913a929070c819e59e94bb37a2a253c228f83921136ff4a7aa1a178c7cce5422", - "zh:aa9015926cd152425dbf86d1abdbc74bfe0e1ba3d26b3db35051d7b9ca9f72ae", - "zh:bb04798b016e1e1d49bcc76d62c53b56c88c63d6f2dfe38821afef17c416a0e1", - "zh:c23084e1b23577de22603cff752e59128d83cfecc2e6819edadd8cf7a10af11e", - ] -} - -provider "registry.terraform.io/integrations/github" { - version = "4.31.0" - constraints = "~> 4.14" - 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", - ] -} diff --git a/terragrunt/accounts/sync-team-prod/sync-team/terragrunt.hcl b/terragrunt/accounts/sync-team-prod/sync-team/terragrunt.hcl deleted file mode 100644 index 820a97e54..000000000 --- a/terragrunt/accounts/sync-team-prod/sync-team/terragrunt.hcl +++ /dev/null @@ -1,8 +0,0 @@ -terraform { - source = "../../../modules//sync-team" -} - -include { - path = find_in_parent_folders() - merge_strategy = "deep" -} diff --git a/terragrunt/modules/sync-team/_terraform.tf b/terragrunt/modules/sync-team/_terraform.tf deleted file mode 100644 index 106c092c1..000000000 --- a/terragrunt/modules/sync-team/_terraform.tf +++ /dev/null @@ -1,29 +0,0 @@ -// Configuration for Terraform itself. - -terraform { - required_version = "~> 1" - - required_providers { - aws = { - source = "hashicorp/aws" - version = "~> 5.65" - } - external = { - source = "hashicorp/external" - version = "~> 2.3.3" - } - github = { - source = "integrations/github" - version = "~> 4.14" - } - } -} - -data "aws_region" "current" {} -data "aws_caller_identity" "current" {} - -provider "aws" { - region = "us-east-1" - alias = "us-east-1" - profile = "sync-team-prod" -} diff --git a/terragrunt/modules/sync-team/ci.tf b/terragrunt/modules/sync-team/ci.tf deleted file mode 100644 index 4870a4595..000000000 --- a/terragrunt/modules/sync-team/ci.tf +++ /dev/null @@ -1,101 +0,0 @@ -// Resources needed for the CI of rust-lang/team and rust-lang/sync-team. - -// ECR repo used to store the Docker image built by rust-lang/sync-team's CI. - -module "ecr" { - source = "../ecr-repo" - name = "sync-team" -} - -// IAM role used by rust-lang/sync-team's CI to push the built images to ECR -// and to invoke the lambda function that runs sync-team. - -module "ci_sync_team" { - source = "../gha-oidc-role" - org = "rust-lang" - repo = "sync-team" - branch = "master" -} - -// IAM role used by rust-lang/team's CI to invoke the lambda function that -// runs sync-team. - -module "ci_team" { - source = "../gha-oidc-role" - org = "rust-lang" - repo = "team" - branch = "master" -} - -// Policies that allow the sync-team role to interact with ECR - -resource "aws_iam_role_policy_attachment" "ci_sync_team_pull" { - role = module.ci_sync_team.role.id - policy_arn = module.ecr.policy_pull_arn -} - -resource "aws_iam_role_policy_attachment" "ci_sync_team_push" { - role = module.ci_sync_team.role.id - policy_arn = module.ecr.policy_push_arn -} - -// Policy for interacting with the lambda function that runs sync-team through CodeBuild. -// -// The CI needs to call the intermediate Lambda function to start the CodeBuild -// for security reasons, as CodeBuild's StartBuild API call allows to override -// pretty much any build parameter, including the executed commands. That could -// allow an attacker to (for example) leak secrets. - -resource "aws_iam_policy" "start_sync_team_policy" { - name = "start-sync-team-policy" - policy = jsonencode({ - Version = "2012-10-17" - Statement = [ - { - Sid = "InvokeLambda" - Effect = "Allow" - Action = "lambda:InvokeFunction" - Resource = module.lambda_start_sync_team.lambda_function_arn - } - ] - }) -} - -// Attaching the invoke lambda function policy to the team and team-sync repos' roles. - -resource "aws_iam_role_policy_attachment" "start_sync_team_team_repo" { - role = module.ci_team.role.id - policy_arn = aws_iam_policy.start_sync_team_policy.arn -} - -resource "aws_iam_role_policy_attachment" "start_sync_team_sync_team_repo" { - role = module.ci_sync_team.role.id - - policy_arn = aws_iam_policy.start_sync_team_policy.arn -} - -// The lambda function for running team-sync - -module "lambda_start_sync_team" { - source = "terraform-aws-modules/lambda/aws" - - function_name = "start-sync-team" - description = "Start sync-team from CI" - handler = "index.handler" - runtime = "nodejs16.x" - publish = true - - source_path = "lambdas/start-sync-team" - - attach_policy_json = true - policy_json = jsonencode({ - Version = "2012-10-17" - Statement = [ - { - Effect = "Allow" - Action = "codebuild:StartBuild" - Resource = aws_codebuild_project.sync_team.arn - } - ] - }) -} diff --git a/terragrunt/modules/sync-team/confirmation.tf b/terragrunt/modules/sync-team/confirmation.tf deleted file mode 100644 index e8b8ac9c7..000000000 --- a/terragrunt/modules/sync-team/confirmation.tf +++ /dev/null @@ -1,132 +0,0 @@ -locals { - domain = "confirmation.sync-team-prod.rust-lang.net" -} - -data "aws_ssm_parameter" "confirmation_parameters" { - for_each = toset([ - "/prod/sync-team-confirmation/github-oauth-client-id", - "/prod/sync-team-confirmation/github-oauth-client-secret", - ]) - - name = each.value - // We don't need the actual value, just their ARNs: - with_decryption = false -} - -module "lambda_confirmation" { - source = "terraform-aws-modules/lambda/aws" - - function_name = "sync-team-confirmation" - description = "Out-of-band confirmation before applying sync-team changes." - handler = "index.handler" - runtime = "python3.9" - publish = true - - source_path = "lambdas/sync-team-confirmation" - - create_lambda_function_url = true - - // While the module supports attaching an inline policy here, in practice we - // cannot attach it here as it'd create a circular dependency between the - // CodeBuild build and the Lambda policy. -} - -resource "aws_iam_policy" "lambda_confirmation" { - name = "sync-team-confirmation" - description = "Policy for the sync-team-confirmation Lambda" - - policy = jsonencode({ - Version = "2012-10-17" - Statement = [ - { - Effect = "Allow" - Action = "codebuild:StartBuild" - Resource = aws_codebuild_project.sync_team.arn - }, - { - Effect = "Allow" - Action = ["ssm:GetParameter", "ssm:GetParameters"], - Resource = [for p in data.aws_ssm_parameter.confirmation_parameters : p.arn] - }, - ] - }) -} - -resource "aws_iam_role_policy_attachment" "lambda_confirmation" { - role = module.lambda_confirmation.lambda_role_name - policy_arn = aws_iam_policy.lambda_confirmation.arn -} - -module "confirmation_certificate" { - source = "../acm-certificate" - providers = { - aws = aws.us-east-1 - } - domains = [local.domain] - legacy = false -} - -resource "aws_cloudfront_distribution" "confirmation" { - comment = local.domain - - enabled = true - wait_for_deployment = true - is_ipv6_enabled = true - price_class = "PriceClass_All" - http_version = "http2and3" - - aliases = [local.domain] - viewer_certificate { - acm_certificate_arn = module.confirmation_certificate.arn - ssl_support_method = "sni-only" - minimum_protocol_version = "TLSv1.2_2021" - } - - default_cache_behavior { - target_origin_id = "lambda" - allowed_methods = ["DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT"] - cached_methods = ["GET", "HEAD"] - compress = true - viewer_protocol_policy = "redirect-to-https" - - default_ttl = 0 - max_ttl = 0 - - forwarded_values { - headers = [] - query_string = true - cookies { - forward = "none" - } - } - } - - origin { - origin_id = "lambda" - domain_name = trimsuffix(trimprefix(module.lambda_confirmation.lambda_function_url, "https://"), "/") - custom_origin_config { - http_port = 80 - https_port = 443 - origin_protocol_policy = "https-only" - origin_ssl_protocols = ["TLSv1.2"] - } - } - - restrictions { - geo_restriction { - restriction_type = "none" - } - } -} - -data "aws_route53_zone" "confirmation_zone" { - name = "sync-team-prod.rust-lang.net" -} - -resource "aws_route53_record" "confirmation_record" { - zone_id = data.aws_route53_zone.confirmation_zone.id - name = "confirmation" - type = "CNAME" - ttl = 300 - records = [aws_cloudfront_distribution.confirmation.domain_name] -} diff --git a/terragrunt/modules/sync-team/lambdas/start-sync-team/index.js b/terragrunt/modules/sync-team/lambdas/start-sync-team/index.js deleted file mode 100644 index 31626d4c7..000000000 --- a/terragrunt/modules/sync-team/lambdas/start-sync-team/index.js +++ /dev/null @@ -1,8 +0,0 @@ -const AWS = require('aws-sdk'); -const CodeBuild = new AWS.CodeBuild(); - -exports.handler = async function(event) { - return CodeBuild.startBuild({ - projectName: 'sync-team', - }).promise(); -}; diff --git a/terragrunt/modules/sync-team/lambdas/sync-team-confirmation/index.py b/terragrunt/modules/sync-team/lambdas/sync-team-confirmation/index.py deleted file mode 100644 index 42f92833b..000000000 --- a/terragrunt/modules/sync-team/lambdas/sync-team-confirmation/index.py +++ /dev/null @@ -1,131 +0,0 @@ -import boto3 -import urllib.parse -import urllib.request -import json - - -ssm = boto3.client("ssm") -codebuild = boto3.client("codebuild") - - -def handler(event, context): - if event["rawPath"].startswith("/authorize/"): - return handler_authorize(event["rawPath"].removeprefix("/authorize/")) - elif event["rawPath"] == "/callback": - return handler_callback(event["queryStringParameters"]) - elif event["rawPath"] == "/success": - return respond_plain( - 200, "Successfully authorized the change, it will be applied soon." - ) - elif event["rawPath"] == "/unauthorized": - return respond_plain(403, "You're not authorized to approve sync-team changes.") - else: - return respond_plain(404, "404 Not Found\n") - - -def handler_authorize(hash): - client_id = ssm.get_parameter( - Name="/prod/sync-team-confirmation/github-oauth-client-id" - )["Parameter"]["Value"] - - return respond_redirect( - f"https://github.com/login/oauth/authorize?client_id={client_id}&state={hash}" - ) - - -def handler_callback(query): - parameters = ssm.get_parameters( - Names=[ - "/prod/sync-team-confirmation/github-oauth-client-id", - "/prod/sync-team-confirmation/github-oauth-client-secret", - ], - WithDecryption=True, - ) - client_id = parameters["Parameters"][0]["Value"] - client_secret = parameters["Parameters"][1]["Value"] - - access_token = http_request( - "POST", - "https://github.com/login/oauth/access_token", - form={ - "client_id": client_id, - "client_secret": client_secret, - "code": query["code"], - }, - headers={ - "Accept": "application/json", - }, - )["access_token"] - - user = http_request( - "GET", - "https://api.github.com/user", - headers={ - "Authorization": f"Bearer {access_token}", - }, - ) - - allowed_users = http_request( - "GET", - "https://team-api.infra.rust-lang.org/v1/permissions/sync_team_confirmation.json", - ) - if user["id"] in allowed_users["github_ids"]: - codebuild.start_build( - projectName="sync-team", - environmentVariablesOverride=[ - { - "name": "CONFIRMATION_APPROVED_HASH", - "value": query["state"], - "type": "PLAINTEXT", - }, - { - "name": "CONFIRMATION_APPROVER", - "value": user["login"], - "type": "PLAINTEXT", - }, - ], - ) - return respond_redirect("/success") - else: - return respond_redirect("/unauthorized") - - -def respond_redirect(url): - return { - "statusCode": 302, - "body": f"Redirecting to {url}\n", - "headers": { - "location": url, - "content-type": "text/plain", - }, - } - - -def respond_plain(status, body): - return { - "statusCode": status, - "body": body, - "headers": { - "content-type": "text/plain", - }, - } - - -def http_request(method, url, *, form=None, headers=None): - data = None - if form is not None: - data = urllib.parse.urlencode(tuple(form.items())).encode("utf-8") - - request = urllib.request.Request(url=url, data=data, method=method) - request.add_header("user-agent", "sync-team-confirmation (infra@rust-lang.org)") - if form is not None: - request.add_header("content-type", "application/x-www-form-urlencoded") - if headers is not None: - for key, value in headers.items(): - request.add_header(key, value) - response = urllib.request.urlopen(request) - - if response.status >= 400: - raise RuntimeError(f"got status code {response.status} while requesting {url}") - - return json.loads(response.read()) diff --git a/terragrunt/modules/sync-team/sync-team.tf b/terragrunt/modules/sync-team/sync-team.tf deleted file mode 100644 index 733fdca96..000000000 --- a/terragrunt/modules/sync-team/sync-team.tf +++ /dev/null @@ -1,192 +0,0 @@ -// CodeBuild project that will run the synchronization, along with the -// CloudWatch log group to store the execution log. - -resource "aws_cloudwatch_log_group" "sync_team" { - name = "/sync-team" - retention_in_days = 30 -} - -resource "aws_codebuild_project" "sync_team" { - name = "sync-team" - description = "Execution of rust-lang/sync-team with production credentials." - build_timeout = 30 - service_role = aws_iam_role.sync_team.arn - - source { - type = "NO_SOURCE" - buildspec = <<-EOF - --- - version: 0.2 - phases: - build: - commands: - - sync-team --live --require-confirmation - EOF - } - - environment { - compute_type = "BUILD_GENERAL1_SMALL" - type = "LINUX_CONTAINER" - image_pull_credentials_type = "SERVICE_ROLE" - image = module.ecr.url - - environment_variable { - type = "PARAMETER_STORE" - name = "GITHUB_TOKEN" - value = "/prod/sync-team/github-token" - } - - environment_variable { - type = "PARAMETER_STORE" - name = "MAILGUN_API_TOKEN" - value = "/prod/sync-team/mailgun-api-token" - } - - environment_variable { - type = "PARAMETER_STORE" - name = "EMAIL_ENCRYPTION_KEY" - value = "/prod/sync-team/email-encryption-key" - } - - environment_variable { - type = "PARAMETER_STORE" - name = "ZULIP_USERNAME" - value = "/prod/sync-team/zulip-username" - } - - environment_variable { - type = "PARAMETER_STORE" - name = "ZULIP_API_TOKEN" - value = "/prod/sync-team/zulip-api-token" - } - - environment_variable { - type = "PLAINTEXT" - name = "CONFIRMATION_STREAM" - value = "t-infra/private" - } - - environment_variable { - type = "PLAINTEXT" - name = "CONFIRMATION_TOPIC" - value = "sync-team" - } - - environment_variable { - type = "PLAINTEXT" - name = "CONFIRMATION_BASE_URL" - value = "https://${aws_cloudfront_distribution.confirmation.domain_name}/authorize" - } - } - - logs_config { - cloudwatch_logs { - group_name = aws_cloudwatch_log_group.sync_team.name - } - } - - artifacts { - type = "NO_ARTIFACTS" - } -} - -// CloudWatch rule to run the synchronization every day. - -resource "aws_cloudwatch_event_rule" "start_daily" { - name = "cloudbuild--sync-team" - description = "Run the sync-team CodeBuild every day." - schedule_expression = "cron(0 * * * ? *)" -} - -resource "aws_cloudwatch_event_target" "start_daily" { - rule = aws_cloudwatch_event_rule.start_daily.name - arn = aws_codebuild_project.sync_team.arn - role_arn = aws_iam_role.start_execution.arn -} - -// IAM Role that CodeBuild will assume when running the build. The role will -// grant access to write the logs, read parameters and pull the ECR image. - -resource "aws_iam_role" "sync_team" { - name = "codebuild--sync-team" - - assume_role_policy = jsonencode({ - Version = "2012-10-17" - Statement = [ - { - Effect = "Allow" - Action = "sts:AssumeRole" - Principal = { - Service = "codebuild.amazonaws.com" - } - } - ] - }) - - inline_policy { - name = "inline" - policy = jsonencode({ - Version = "2012-10-17" - Statement = [ - { - Sid = "AllowParameterStore" - Effect = "Allow" - Action = "ssm:GetParameters" - Resource = [ - "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter/prod/sync-team/*" - ] - }, - { - Sid = "AllowLogs" - Effect = "Allow" - Action = [ - "logs:PutLogEvents", - "logs:CreateLogStream", - ] - Resource = "${aws_cloudwatch_log_group.sync_team.arn}:*" - } - ] - }) - } -} - -resource "aws_iam_role_policy_attachment" "sync_team_pull_ecr" { - role = aws_iam_role.sync_team.name - policy_arn = module.ecr.policy_pull_arn -} - -// IAM Role that can be assumed to start the synchronization. - -resource "aws_iam_role" "start_execution" { - name = "events-start-sync-team" - assume_role_policy = jsonencode({ - Version = "2012-10-17" - Statement = [ - { - Effect = "Allow" - Action = "sts:AssumeRole" - Principal = { - Service = [ - "events.amazonaws.com", - ] - } - } - ] - }) -} - -resource "aws_iam_role_policy" "start_execution" { - role = aws_iam_role.start_execution.name - - policy = jsonencode({ - Version = "2012-10-17" - Statement = [ - { - Sid = "AllowStartBuild" - Effect = "Allow" - Action = "codebuild:StartBuild" - Resource = aws_codebuild_project.sync_team.arn - } - ] - }) -} From 6e526a3fb969ae084c91affd2df6f8ee97294079 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:25:12 +0200 Subject: [PATCH 193/217] chore: delete sync-team-prod common terragrunt module Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> --- .../sync-team-prod/common/.terraform.lock.hcl | 45 ------------------- .../sync-team-prod/common/terragrunt.hcl | 8 ---- terragrunt/modules/common/_terraform.tf | 14 ------ terragrunt/modules/common/gha-oidc.tf | 17 ------- 4 files changed, 84 deletions(-) delete mode 100644 terragrunt/accounts/sync-team-prod/common/.terraform.lock.hcl delete mode 100644 terragrunt/accounts/sync-team-prod/common/terragrunt.hcl delete mode 100644 terragrunt/modules/common/_terraform.tf delete mode 100644 terragrunt/modules/common/gha-oidc.tf diff --git a/terragrunt/accounts/sync-team-prod/common/.terraform.lock.hcl b/terragrunt/accounts/sync-team-prod/common/.terraform.lock.hcl deleted file mode 100644 index df1d1b9fb..000000000 --- a/terragrunt/accounts/sync-team-prod/common/.terraform.lock.hcl +++ /dev/null @@ -1,45 +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 = "5.64.0" - constraints = "~> 5.64" - hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", - ] -} - -provider "registry.terraform.io/hashicorp/tls" { - version = "4.0.5" - constraints = "~> 4.0" - hashes = [ - "h1:zeG5RmggBZW/8JWIVrdaeSJa0OG62uFX5HY1eE8SjzY=", - "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", - "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", - "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", - "zh:1e3bb505c000adb12cdf60af5b08f0ed68bc3955b0d4d4a126db5ca4d429eb4a", - "zh:6636401b2463c25e03e68a6b786acf91a311c78444b1dc4f97c539f9f78de22a", - "zh:76858f9d8b460e7b2a338c477671d07286b0d287fd2d2e3214030ae8f61dd56e", - "zh:a13b69fb43cb8746793b3069c4d897bb18f454290b496f19d03c3387d1c9a2dc", - "zh:a90ca81bb9bb509063b736842250ecff0f886a91baae8de65c8430168001dad9", - "zh:c4de401395936e41234f1956ebadbd2ed9f414e6908f27d578614aaa529870d4", - "zh:c657e121af8fde19964482997f0de2d5173217274f6997e16389e7707ed8ece8", - "zh:d68b07a67fbd604c38ec9733069fbf23441436fecf554de6c75c032f82e1ef19", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - ] -} diff --git a/terragrunt/accounts/sync-team-prod/common/terragrunt.hcl b/terragrunt/accounts/sync-team-prod/common/terragrunt.hcl deleted file mode 100644 index d287a8a68..000000000 --- a/terragrunt/accounts/sync-team-prod/common/terragrunt.hcl +++ /dev/null @@ -1,8 +0,0 @@ -terraform { - source = "../../../modules//common" -} - -include { - path = find_in_parent_folders() - merge_strategy = "deep" -} diff --git a/terragrunt/modules/common/_terraform.tf b/terragrunt/modules/common/_terraform.tf deleted file mode 100644 index 9ad00d065..000000000 --- a/terragrunt/modules/common/_terraform.tf +++ /dev/null @@ -1,14 +0,0 @@ -terraform { - required_version = "~> 1" - - required_providers { - aws = { - source = "hashicorp/aws" - version = "~> 5.64" - } - tls = { - source = "hashicorp/tls" - version = "~> 4.0" - } - } -} diff --git a/terragrunt/modules/common/gha-oidc.tf b/terragrunt/modules/common/gha-oidc.tf deleted file mode 100644 index fe467f285..000000000 --- a/terragrunt/modules/common/gha-oidc.tf +++ /dev/null @@ -1,17 +0,0 @@ -// This section configures the trust relationship between GitHub Actions and -// our AWS account. - -locals { - url = "https://token.actions.githubusercontent.com" -} - -data "tls_certificate" "github_actions" { - url = local.url -} - -resource "aws_iam_openid_connect_provider" "github_actions" { - url = local.url - - client_id_list = ["sts.amazonaws.com"] - thumbprint_list = data.tls_certificate.github_actions.certificates.*.sha1_fingerprint -} From 2a5d183e5b0445ce3fcc87a3b5fb4b29a3fd48da Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:30:55 +0200 Subject: [PATCH 194/217] chore: delete sync-team-prod dns zone Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> --- .../dns-zone/.terraform.lock.hcl | 24 ------------------- .../sync-team-prod/dns-zone/terragrunt.hcl | 12 ---------- 2 files changed, 36 deletions(-) delete mode 100644 terragrunt/accounts/sync-team-prod/dns-zone/.terraform.lock.hcl delete mode 100644 terragrunt/accounts/sync-team-prod/dns-zone/terragrunt.hcl diff --git a/terragrunt/accounts/sync-team-prod/dns-zone/.terraform.lock.hcl b/terragrunt/accounts/sync-team-prod/dns-zone/.terraform.lock.hcl deleted file mode 100644 index 250398d18..000000000 --- a/terragrunt/accounts/sync-team-prod/dns-zone/.terraform.lock.hcl +++ /dev/null @@ -1,24 +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 = "5.64.0" - hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", - ] -} diff --git a/terragrunt/accounts/sync-team-prod/dns-zone/terragrunt.hcl b/terragrunt/accounts/sync-team-prod/dns-zone/terragrunt.hcl deleted file mode 100644 index 905b4a614..000000000 --- a/terragrunt/accounts/sync-team-prod/dns-zone/terragrunt.hcl +++ /dev/null @@ -1,12 +0,0 @@ -terraform { - source = "../../../modules//dns-zone" -} - -include { - path = find_in_parent_folders() - merge_strategy = "deep" -} - -inputs = { - name = "sync-team-prod.rust-lang.net" -} From 03cbc54fefc412fb880add62574607e7e1f91298 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:38:43 +0200 Subject: [PATCH 195/217] chore: delete sync-team-prod wiz and datadog integrations Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> --- .../datadog-aws/.terraform.lock.hcl | 47 ------------------- .../sync-team-prod/datadog-aws/terragrunt.hcl | 12 ----- .../sync-team-prod/wiz/.terraform.lock.hcl | 25 ---------- .../sync-team-prod/wiz/terragrunt.hcl | 8 ---- 4 files changed, 92 deletions(-) delete mode 100644 terragrunt/accounts/sync-team-prod/datadog-aws/.terraform.lock.hcl delete mode 100644 terragrunt/accounts/sync-team-prod/datadog-aws/terragrunt.hcl delete mode 100644 terragrunt/accounts/sync-team-prod/wiz/.terraform.lock.hcl delete mode 100644 terragrunt/accounts/sync-team-prod/wiz/terragrunt.hcl diff --git a/terragrunt/accounts/sync-team-prod/datadog-aws/.terraform.lock.hcl b/terragrunt/accounts/sync-team-prod/datadog-aws/.terraform.lock.hcl deleted file mode 100644 index dd64863f4..000000000 --- a/terragrunt/accounts/sync-team-prod/datadog-aws/.terraform.lock.hcl +++ /dev/null @@ -1,47 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/datadog/datadog" { - version = "3.43.1" - constraints = "3.43.1" - hashes = [ - "h1:pcyAjQvw5BUajiVGJQ6nVWdocfSnCRdazHwTzjdOh3M=", - "zh:115a656d68c9ac95188a3421dd8aa5a9ba4074d42b717fcc87ffd45576231857", - "zh:1dc3687237d8c2c947ebd5a3c80404c17dbf210cfb7f3b4464fd6e12f6784398", - "zh:24dc4d31edd69977bdf6004d85092d7013f6f7917c24ecb758717962dd7cbfe5", - "zh:2e5def7d74f488070443f86d75fb9813736c085efb5fa1f7e0f6151a2f83a30b", - "zh:6e4502bbd54b0a782b582c4d22aaa43814eae6a0b66f4835648c27f6015d505d", - "zh:8105124f33fa84fd59af3a18ab8534ce7f956c2e8a9d26546adfdbc9e8d7c725", - "zh:8ac9fc28cb06326c51ee2a35ee092e0abbaa2545a72f3318c406e9e5f0ef22a1", - "zh:a17997d6e2aafd488af6fcede3d20acfe72d5d6f0c1d257880657da1eb0a175e", - "zh:b35ea09714425c17578b6473c362380bb9b276d3f8bfff675d1ee7deb11377a7", - "zh:b71dfa4bde00632c0ebc9531274f337891303cf2e647b479d5030c22b33347ba", - "zh:ba51ddc2dc8c8e72426e873b2e3abac0ebfb9724207ba135bb3aa4775a523429", - "zh:bb5631c8c209fc94434164acd7478726f1f8ef40089e68eff12d131a648961bf", - "zh:c165ae439b26834858139fe971b702e5baad74db22b6439784b37690d087ffca", - "zh:d185755f6a0d4783fb42121109eeec4207f9caf35e7066bdf1101d12ae2c2ec8", - ] -} - -provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = "~> 5.64" - hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", - ] -} diff --git a/terragrunt/accounts/sync-team-prod/datadog-aws/terragrunt.hcl b/terragrunt/accounts/sync-team-prod/datadog-aws/terragrunt.hcl deleted file mode 100644 index a3ded3aab..000000000 --- a/terragrunt/accounts/sync-team-prod/datadog-aws/terragrunt.hcl +++ /dev/null @@ -1,12 +0,0 @@ -terraform { - source = "../../../modules//datadog-aws" -} - -include { - path = find_in_parent_folders() - merge_strategy = "deep" -} - -inputs = { - env = "prod" -} diff --git a/terragrunt/accounts/sync-team-prod/wiz/.terraform.lock.hcl b/terragrunt/accounts/sync-team-prod/wiz/.terraform.lock.hcl deleted file mode 100644 index bbf28555f..000000000 --- a/terragrunt/accounts/sync-team-prod/wiz/.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 = "5.64.0" - constraints = "~> 5.64" - hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", - ] -} diff --git a/terragrunt/accounts/sync-team-prod/wiz/terragrunt.hcl b/terragrunt/accounts/sync-team-prod/wiz/terragrunt.hcl deleted file mode 100644 index 40faf2933..000000000 --- a/terragrunt/accounts/sync-team-prod/wiz/terragrunt.hcl +++ /dev/null @@ -1,8 +0,0 @@ -terraform { - source = "../../../..//terragrunt/modules/wiz" -} - -include { - path = find_in_parent_folders() - merge_strategy = "deep" -} From da171f075f98d2d8a1ee451a5849334a09eee125 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:02:04 +0200 Subject: [PATCH 196/217] chore: delete sync-team-prod account Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> --- terragrunt/accounts/sync-team-prod/account.json | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 terragrunt/accounts/sync-team-prod/account.json diff --git a/terragrunt/accounts/sync-team-prod/account.json b/terragrunt/accounts/sync-team-prod/account.json deleted file mode 100644 index 863d92a08..000000000 --- a/terragrunt/accounts/sync-team-prod/account.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "aws": { - "profile": "sync-team-prod", - "regions": [ - { - "region": "us-east-2" - } - ] - } -} From cc0e0fa185ea5f45487d70bfeafcabfa1c0e9f23 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:11:03 +0200 Subject: [PATCH 197/217] chore(crater): update terraform providers --- terraform/crater/.terraform.lock.hcl | 84 ++++++++++++++-------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/terraform/crater/.terraform.lock.hcl b/terraform/crater/.terraform.lock.hcl index d502df0ee..c60a92713 100644 --- a/terraform/crater/.terraform.lock.hcl +++ b/terraform/crater/.terraform.lock.hcl @@ -2,64 +2,64 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.21.0" + version = "4.67.0" constraints = "~> 4.20" hashes = [ - "h1:cama4orjGQ+7IBf6FRJ3AmcmrbOa5ENSeDexbl6ddpM=", - "h1:eeuRCgJ2aEsVvCl0UOU99Rx58L2NMpM4Q5XdsfO4sr8=", - "zh:16529a8ac663845da9214a75f5a32a2d0daf393612e46259b6dff10f1b8b50ed", - "zh:1ae36386d4862a489a3981a482a537c16f8a1588a445b60f173d1f13fcc3552e", - "zh:5ab0f63784f7216528855272b341d3cbfbf378dc6ee23796debead505aff58a2", - "zh:5f28fec15d2e58623b0cdb610e36703b3035fb3a61289c6d8a4705fca5144cb8", - "zh:60b664b6d34b27609b3b4273dffa41ff2c6d15bb01e326bcd6a40944f9cc9839", - "zh:6a9010783b1c4574956e047d9981e96f8d4bbdd7057496ad35bb81acc0efa862", - "zh:8631ceb0187605305e2045f1f6aded046ba17e0cad64663011dd55c8a20330ec", - "zh:891ac1b0053c435b939462b1872ab383e72a8de05454164def2b96a362f7a729", - "zh:92bccfd7517abeda2ac6ddb78f1819742cafdba87af2074929d57cd7f2256c22", + "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", + "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", + "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", + "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", + "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", + "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", + "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", + "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", + "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", + "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:ad169953f8b9441624064815bd4b82b12ab20ba3e2f033ecf019d6a25ae42175", - "zh:b46eccb3bec96ace8863cd0302de475dd22e4bdd2176ddb82e76f998424e7ac3", + "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", + "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", + "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", + "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", + "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", ] } provider "registry.terraform.io/hashicorp/dns" { - version = "3.2.3" + version = "3.2.4" constraints = "~> 3.2.3" hashes = [ - "h1:ALe1bPHF550GAEdEDgujL1Ea0UQ7O5KEL/jQWlCfemY=", - "h1:ODcR+vWOhCAJ2iCChZMVdRglNCx07VNr67OPLRPZyDY=", - "zh:03a304f4b76ac6c8bebffddcdf555bf77578a7f638948a681589def32e140cb8", - "zh:08c7d2498b747054e9c9df7838bfa4e4a6b5d63e2d29f0457247e384f792d56c", - "zh:20adf489819ba51ba9d9d15da2dbe1fecb92491b3d0dd80096873e5e84d8b4bd", - "zh:2959ff209d2578456ca490672b82864d483b9e9db9efc8e4ffada06e23017609", - "zh:3ecd0b22db79550fb1108ff7bd00c4066825e8c23bb64e3cc8d9b8102e8caa45", - "zh:6e53a9232245b4be52b56b078f15f270b89afe6abb9c9b8baab4a282fe0cf9f8", + "h1:+S0SAfuuYh7LtMoHbX4soqWhAAs92hUQ1kWuJ7uUeMg=", + "zh:13f1284887be8ebcf279e0e84d685751fbd40bd1f1abbea0ee6ba57bae5bcc4f", + "zh:22e7428d6af0cbb2191b17da9406b4cfc110ab2ce57ee818d505dbdc03cab325", + "zh:3690ec6483dd879a292592859d38391813d48f2efeceafcc7bae4a0e34cfc9f9", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:80437bdfa08eb90f70105b52cb06799a8f7967313654b43d28d7f654fcd4edc1", - "zh:816ddaca0ecc29e287376e5b0b8b0729ee13f23a9d74bfad5b14b7983e1a1775", - "zh:82d8ac7ad00c1a71d0a7c1aca03bb59a6b51128f895242df80b1f3d016c3c51a", - "zh:ec9243b8bd80693a6eeeea5d4f7f4e6f57bd44ae796d6d5b1a91790e359f8a61", - "zh:fd821adbfb03a2c9eac111ff27a32b3a5523b18f80333008de85482d3bbea645", + "zh:8a9b713c80e5fa288bd4a942974307c835c434c2370a600977abbc7e3b71fbc4", + "zh:96a033b54ec602b6daa669d4913d33ed9ad5751fafce5ec94df6c2accaa93ba5", + "zh:cc64dd880e91a32e112a0a030240f096606162da74e3a8e454c0f31553080bfd", + "zh:db30eb45ad3c295c953d8c6063354d9c3c97b7b208ae4cf8b454b4ea973c577d", + "zh:dfe060ccd4d1ea363227e9b19b87a024e75d7a1f4f5147bf367b2f5991b9667c", + "zh:f290a90e9130204bb01557a842232496c2ab0de9aa3de32fc21125d35333486b", + "zh:f688e49913c21d14765558b239a236d2cc7c7dd10c77b78e3dc1767cbd4e94ef", + "zh:fb34249421e6fd4d364518f657811e752f38d7bc234f17c0b3cb704e6f1b0057", ] } provider "registry.terraform.io/hashicorp/google" { - version = "4.27.0" + version = "4.85.0" constraints = "~> 4.23" hashes = [ - "h1:6cSnbwlHbLHaQZb116WfspEfhL5Y+f2n0jypjPgK4iA=", - "h1:bKba6xHbZTkhnOby8HgmlmofNUdvlMq1MTE2yAA4dIQ=", - "zh:0ec41ae6810de7e1dbf8c8926523fb2cb6947f62932152c82c2c52ca2d9880be", - "zh:28349b499a631e15a02eb9603c659ec894cd50149be6b90c3b35b11980a234a2", - "zh:2fcbb1c4d3e6512a18330eb8141b2518acac2358fb7c05c374d32a6dcc435916", - "zh:4535e448bd794743fe14e8f9d1e640b28a0689b44341ea8fd5d9b229038693c8", - "zh:545ac27a491cb054ca4b7fbd83999a0b48e445036c06cb470c78afb9dcb5fb6f", - "zh:60df2a43c3791e1c919cdf9f1388dcf73cd4c9de4e266539b2c489eb8be9ec09", - "zh:756ea83635bc607e935cd0b9adaa3fc0f9528038766e1dba1f79d74c42556ffb", - "zh:7bf6c65359cc5fef8757787abe5f5f8ca786ce4de3045872226b54a7b51a5e29", - "zh:bbb0f05e4f080aae755752e68ca8b03240602d7af254a86af1e392c0dd5776b5", - "zh:c663bc5b18bc5015ccf763f6f6baea26319459e1e757af34a250b27cf689b80a", - "zh:da23872670199d3ce5448c1a75bf4ac9fbeafb92bad84a3e977de6c0a9dced08", + "h1:ZVDZuhYSIWhCkSuDkwFeSIJjn0/DcCxak2W/cHW4OQQ=", + "zh:17d60a6a6c1741cf1e09ac6731433a30950285eac88236e623ab4cbf23832ca3", + "zh:1c70254c016439dbb75cab646b4beace6ceeff117c75d81f2cc27d41c312f752", + "zh:35e2aa2cc7ac84ce55e05bb4de7b461b169d3582e56d3262e249ff09d64fe008", + "zh:417afb08d7b2744429f6b76806f4134d62b0354acf98e8a6c00de3c24f2bb6ad", + "zh:622165d09d21d9a922c86f1fc7177a400507f2a8c4a4513114407ae04da2dd29", + "zh:7cdb8e39a8ea0939558d87d2cb6caceded9e21f21003d9e9f9ce648d5db0bc3a", + "zh:851e737dc551d6004a860a8907fda65118fc2c7ede9fa828f7be704a2a39e68f", + "zh:a331ad289a02a2c4473572a573dc389be0a604cdd9e03dd8dbc10297fb14f14d", + "zh:b67fd531251380decd8dd1f849460d60f329f89df3d15f5815849a1dd001f430", + "zh:be8785957acca4f97aa3e800b313b57d1fca07788761c8867c9bc701fbe0bdb5", + "zh:cb6579a259fe020e1f88217d8f6937b2d5ace15b6406370977a1966eb31b1ca5", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } From 5c69c720d379be9b960e210ed68f4d586df28b8a Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:31:47 +0200 Subject: [PATCH 198/217] chore: update crater providers --- terraform/crater/.terraform.lock.hcl | 90 ++++++++++++++-------------- terraform/crater/main.tf | 6 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/terraform/crater/.terraform.lock.hcl b/terraform/crater/.terraform.lock.hcl index c60a92713..2adeed9c3 100644 --- a/terraform/crater/.terraform.lock.hcl +++ b/terraform/crater/.terraform.lock.hcl @@ -2,64 +2,64 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.67.0" - constraints = "~> 4.20" + version = "5.65.0" + constraints = ">= 4.20.0, ~> 5.65, < 6.0.0" hashes = [ - "h1:5Zfo3GfRSWBaXs4TGQNOflr1XaYj6pRnVJLX5VAjFX4=", - "zh:0843017ecc24385f2b45f2c5fce79dc25b258e50d516877b3affee3bef34f060", - "zh:19876066cfa60de91834ec569a6448dab8c2518b8a71b5ca870b2444febddac6", - "zh:24995686b2ad88c1ffaa242e36eee791fc6070e6144f418048c4ce24d0ba5183", - "zh:4a002990b9f4d6d225d82cb2fb8805789ffef791999ee5d9cb1fef579aeff8f1", - "zh:559a2b5ace06b878c6de3ecf19b94fbae3512562f7a51e930674b16c2f606e29", - "zh:6a07da13b86b9753b95d4d8218f6dae874cf34699bca1470d6effbb4dee7f4b7", - "zh:768b3bfd126c3b77dc975c7c0e5db3207e4f9997cf41aa3385c63206242ba043", - "zh:7be5177e698d4b547083cc738b977742d70ed68487ce6f49ecd0c94dbf9d1362", - "zh:8b562a818915fb0d85959257095251a05c76f3467caa3ba95c583ba5fe043f9b", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9c385d03a958b54e2afd5279cd8c7cbdd2d6ca5c7d6a333e61092331f38af7cf", - "zh:b3ca45f2821a89af417787df8289cb4314b273d29555ad3b2a5ab98bb4816b3b", - "zh:da3c317f1db2469615ab40aa6baba63b5643bae7110ff855277a1fb9d8eb4f2c", - "zh:dc6430622a8dc5cdab359a8704aec81d3825ea1d305bbb3bbd032b1c6adfae0c", - "zh:fac0d2ddeadf9ec53da87922f666e1e73a603a611c57bcbc4b86ac2821619b1d", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } provider "registry.terraform.io/hashicorp/dns" { - version = "3.2.4" - constraints = "~> 3.2.3" + version = "3.4.1" + constraints = "~> 3.4.1" hashes = [ - "h1:+S0SAfuuYh7LtMoHbX4soqWhAAs92hUQ1kWuJ7uUeMg=", - "zh:13f1284887be8ebcf279e0e84d685751fbd40bd1f1abbea0ee6ba57bae5bcc4f", - "zh:22e7428d6af0cbb2191b17da9406b4cfc110ab2ce57ee818d505dbdc03cab325", - "zh:3690ec6483dd879a292592859d38391813d48f2efeceafcc7bae4a0e34cfc9f9", + "h1:Ds8mPH2ZDdHsvcZTFaM7KgmRlyIaxv1T6zxUOioNso0=", + "zh:00fc9ba46d66a35c0f4cb66d19b402280f5d074a5652b6a378aac9b11b93d069", + "zh:0d612631e82f246d1e7ee20d3dff29ad1c328d1cec0a3b030719e6246676737b", + "zh:29b847c53ea307acf7ed923c751f3051aae3308a23ba376ad86b120c0f6b978b", + "zh:4b5612e01d369ba56abe87daaea12e65114da9befdd080bf26269dfcbd1c07fa", + "zh:5a2e3af49eabe6592bc24ff6c718872cc8a3fbc3b7be152b00d124ef1dd5d0bd", + "zh:6570128aa7cb71390f78b9aa918c937f1ab0d695e8d7a0b38b84713d2cc92893", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:8a9b713c80e5fa288bd4a942974307c835c434c2370a600977abbc7e3b71fbc4", - "zh:96a033b54ec602b6daa669d4913d33ed9ad5751fafce5ec94df6c2accaa93ba5", - "zh:cc64dd880e91a32e112a0a030240f096606162da74e3a8e454c0f31553080bfd", - "zh:db30eb45ad3c295c953d8c6063354d9c3c97b7b208ae4cf8b454b4ea973c577d", - "zh:dfe060ccd4d1ea363227e9b19b87a024e75d7a1f4f5147bf367b2f5991b9667c", - "zh:f290a90e9130204bb01557a842232496c2ab0de9aa3de32fc21125d35333486b", - "zh:f688e49913c21d14765558b239a236d2cc7c7dd10c77b78e3dc1767cbd4e94ef", - "zh:fb34249421e6fd4d364518f657811e752f38d7bc234f17c0b3cb704e6f1b0057", + "zh:874cbc34ef9973e4b1f894d910e7f853cc317ee6b5208179d41c1bfa51831425", + "zh:946d5fbe75d4fc0fdc1d2deea85a5e02ec46f6830731f9414884276b7c3ec4bc", + "zh:b1cde393e83634c733649caea76ef6f4f14f01f2b04e8c90926ccbb49ac6c53d", + "zh:b803d82cf6fc8ae6660f896144e065d6ed032273a3eb418e62b39a7dec73f734", + "zh:e8d8b93b1c13b199c929819b2b049627a6d3874fd3f16e05b3f594d526233dd6", ] } provider "registry.terraform.io/hashicorp/google" { - version = "4.85.0" - constraints = "~> 4.23" + version = "6.0.1" + constraints = "~> 6.0.1" hashes = [ - "h1:ZVDZuhYSIWhCkSuDkwFeSIJjn0/DcCxak2W/cHW4OQQ=", - "zh:17d60a6a6c1741cf1e09ac6731433a30950285eac88236e623ab4cbf23832ca3", - "zh:1c70254c016439dbb75cab646b4beace6ceeff117c75d81f2cc27d41c312f752", - "zh:35e2aa2cc7ac84ce55e05bb4de7b461b169d3582e56d3262e249ff09d64fe008", - "zh:417afb08d7b2744429f6b76806f4134d62b0354acf98e8a6c00de3c24f2bb6ad", - "zh:622165d09d21d9a922c86f1fc7177a400507f2a8c4a4513114407ae04da2dd29", - "zh:7cdb8e39a8ea0939558d87d2cb6caceded9e21f21003d9e9f9ce648d5db0bc3a", - "zh:851e737dc551d6004a860a8907fda65118fc2c7ede9fa828f7be704a2a39e68f", - "zh:a331ad289a02a2c4473572a573dc389be0a604cdd9e03dd8dbc10297fb14f14d", - "zh:b67fd531251380decd8dd1f849460d60f329f89df3d15f5815849a1dd001f430", - "zh:be8785957acca4f97aa3e800b313b57d1fca07788761c8867c9bc701fbe0bdb5", - "zh:cb6579a259fe020e1f88217d8f6937b2d5ace15b6406370977a1966eb31b1ca5", + "h1:yYQNXIaAp7gNCcmPcVMLYyvEmWxaFdIXwW2BYDvf864=", + "zh:053bcc0e62396d10a4ef40e59dcdf7d4a1491839e0dfc945de7cef5d9106a566", + "zh:282624e6dd086dfe10281f6ad6def3b64279e69fbd667d1141c5f1565e42aecf", + "zh:633384cc00d1c6e84b6cb302a898a407c85806a818ca2c93989992b4f9e9af99", + "zh:7099aa1a79594c6e041659e36a48f0134a19bd8e1810dfddc21bbad6d3e36d54", + "zh:8259adb345c1563a64bdc58efd1cae2ff174b518ccb1f31f79c9c5825e7f762e", + "zh:ae2c3008fe93a3bc1318079c23b1da9b55a77ace45f18cf0fa3b2aefcf33e94a", + "zh:b7f17cb09b4636edf4aed68ab224885523bd33a0b50af2a2a2819d5a843d49e9", + "zh:bee71d0adb8b842b812e4fc76853bedec93c17a6cbf56bc502a2ecf0bcbdaf98", + "zh:c187e22fa33cfa90a093cd25e61a77fb88898cce3f79bef33392ddb7708724ca", + "zh:dd5923c79697be9429edb98156aa94e69b7258f8de42d8c910dde6814c1ef981", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:fe789dc52fc029c18e92db0efb3b013d15679b81c1ab633fa69b3eacde9842ac", ] } diff --git a/terraform/crater/main.tf b/terraform/crater/main.tf index a27b2f5a5..114aee68f 100644 --- a/terraform/crater/main.tf +++ b/terraform/crater/main.tf @@ -18,17 +18,17 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.20" + version = "~> 5.65" } google = { source = "hashicorp/google" - version = "~> 4.23" + version = "~> 6.0.1" } dns = { source = "hashicorp/dns" - version = "~> 3.2.3" + version = "~> 3.4.1" } } From 5c18bb018e155d9c86cb6178a5e269d102b447e9 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:40:09 +0200 Subject: [PATCH 199/217] chore: update aws provider --- terraform/bors/.terraform.lock.hcl | 34 +++++++++---------- .../.terraform.lock.hcl | 34 +++++++++---------- terraform/docs-rs/.terraform.lock.hcl | 34 +++++++++---------- .../domain-redirects/.terraform.lock.hcl | 34 +++++++++---------- terraform/fastly-exporter/.terraform.lock.hcl | 34 +++++++++---------- terraform/monitorbot/.terraform.lock.hcl | 34 +++++++++---------- terraform/playground/.terraform.lock.hcl | 34 +++++++++---------- terraform/rust-forge/.terraform.lock.hcl | 34 +++++++++---------- .../rust-log-analyzer/.terraform.lock.hcl | 34 +++++++++---------- terraform/rustc-ci/.terraform.lock.hcl | 34 +++++++++---------- terraform/shared/.terraform.lock.hcl | 34 +++++++++---------- .../shared/modules/acm-certificate/main.tf | 5 ++- .../shared/modules/static-website/main.tf | 5 ++- 13 files changed, 191 insertions(+), 193 deletions(-) diff --git a/terraform/bors/.terraform.lock.hcl b/terraform/bors/.terraform.lock.hcl index b8a50911c..ef171ff44 100644 --- a/terraform/bors/.terraform.lock.hcl +++ b/terraform/bors/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" + version = "5.65.0" + constraints = ">= 5.64.0, ~> 5.64" hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } diff --git a/terraform/crates-io-heroku-metrics/.terraform.lock.hcl b/terraform/crates-io-heroku-metrics/.terraform.lock.hcl index f8eb0e7b0..fea80ee2c 100644 --- a/terraform/crates-io-heroku-metrics/.terraform.lock.hcl +++ b/terraform/crates-io-heroku-metrics/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" + version = "5.65.0" + constraints = ">= 5.64.0, ~> 5.64" hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } diff --git a/terraform/docs-rs/.terraform.lock.hcl b/terraform/docs-rs/.terraform.lock.hcl index b8a50911c..ef171ff44 100644 --- a/terraform/docs-rs/.terraform.lock.hcl +++ b/terraform/docs-rs/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" + version = "5.65.0" + constraints = ">= 5.64.0, ~> 5.64" hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } diff --git a/terraform/domain-redirects/.terraform.lock.hcl b/terraform/domain-redirects/.terraform.lock.hcl index 6a8362798..32ace7d9e 100644 --- a/terraform/domain-redirects/.terraform.lock.hcl +++ b/terraform/domain-redirects/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" + version = "5.65.0" + constraints = ">= 5.64.0, ~> 5.64" hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } diff --git a/terraform/fastly-exporter/.terraform.lock.hcl b/terraform/fastly-exporter/.terraform.lock.hcl index 6a8362798..32ace7d9e 100644 --- a/terraform/fastly-exporter/.terraform.lock.hcl +++ b/terraform/fastly-exporter/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" + version = "5.65.0" + constraints = ">= 5.64.0, ~> 5.64" hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } diff --git a/terraform/monitorbot/.terraform.lock.hcl b/terraform/monitorbot/.terraform.lock.hcl index b8a50911c..ef171ff44 100644 --- a/terraform/monitorbot/.terraform.lock.hcl +++ b/terraform/monitorbot/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" + version = "5.65.0" + constraints = ">= 5.64.0, ~> 5.64" hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } diff --git a/terraform/playground/.terraform.lock.hcl b/terraform/playground/.terraform.lock.hcl index d72f7bc03..0bde8cc71 100644 --- a/terraform/playground/.terraform.lock.hcl +++ b/terraform/playground/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" + version = "5.65.0" + constraints = ">= 5.64.0, ~> 5.64" hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } diff --git a/terraform/rust-forge/.terraform.lock.hcl b/terraform/rust-forge/.terraform.lock.hcl index 943e17a5e..32ace7d9e 100644 --- a/terraform/rust-forge/.terraform.lock.hcl +++ b/terraform/rust-forge/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = ">= 4.20.0, >= 4.28.0, ~> 5.64, < 6.0.0" + version = "5.65.0" + constraints = ">= 5.64.0, ~> 5.64" hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } diff --git a/terraform/rust-log-analyzer/.terraform.lock.hcl b/terraform/rust-log-analyzer/.terraform.lock.hcl index f8eb0e7b0..fea80ee2c 100644 --- a/terraform/rust-log-analyzer/.terraform.lock.hcl +++ b/terraform/rust-log-analyzer/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = ">= 4.20.0, ~> 5.64, < 6.0.0" + version = "5.65.0" + constraints = ">= 5.64.0, ~> 5.64" hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } diff --git a/terraform/rustc-ci/.terraform.lock.hcl b/terraform/rustc-ci/.terraform.lock.hcl index ce798dfac..fea80ee2c 100644 --- a/terraform/rustc-ci/.terraform.lock.hcl +++ b/terraform/rustc-ci/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = ">= 4.20.0, >= 4.28.0, ~> 5.64, < 6.0.0" + version = "5.65.0" + constraints = ">= 5.64.0, ~> 5.64" hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } diff --git a/terraform/shared/.terraform.lock.hcl b/terraform/shared/.terraform.lock.hcl index 40a3156fb..eb6399a6e 100644 --- a/terraform/shared/.terraform.lock.hcl +++ b/terraform/shared/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.64.0" - constraints = ">= 4.20.0, >= 4.28.0, ~> 5.64, < 6.0.0" + version = "5.65.0" + constraints = ">= 5.64.0, ~> 5.64" hashes = [ - "h1:YH4I78rsS9t+YoGMPNzrM53aWi0Rb9Nud16iusrSXMg=", - "zh:1d361f8062c68c9d5ac14b0aa8390709542129b8a9b258e61bbbabc706078b44", - "zh:39dcbf53e3896bdd77071384c8fad4a5862c222c73f3bcf356aca488101f22fd", - "zh:3fad63505f0c5b6f01cc9a6ef02b2226983b79424126a9caf6eb724f654299f4", - "zh:53a8b90d00829cc27e3171a13a8ff1404ee0ea018e73f31d3f916d246cc39613", - "zh:5734c25ef5a04b40f3c1ac5f817f11e42ee3328f74dbc141c0e64afbb0acc834", - "zh:66ea14dbd87f291ce4a877123363933d3ca4022f209f885807a6689c22c24e80", - "zh:68e79654ad0894a3d93134c3377748ace3058d5fad5ec09d1e9a8f8f9b8a47ea", - "zh:7b74259d0ceef0c49cea6bcd171df997b6bad141085bbadded15b440faeb0eee", - "zh:988ebfb5d115dc57070b5abf2e4200ad49cde535f27fd2ba5e34cf9ab336a57f", + "h1:OG8xMZjGZL/OtEV9OwX0CTPcUzvSfcfiB0X9lcs2joY=", + "zh:036f8557c8c9b58656e1ec08ed5702e44bd338fda17dc4b2add40b234102e29a", + "zh:0ba0708ece98735540070899a916b7a90c5c887be31ffd693ee1359e40245978", + "zh:12d82a82ae0e3bc580f2be961078e89d129e12df7dd82a6ec610a2b945bba1a4", + "zh:1ed0ee17df8807aef64976e2a4276d2a3e1d54efeae2a86f596d12eccb94dc83", + "zh:36b7c61a83d24f612156b4648027ba8bd5727f0ed57183cbad0e6c93b7503aa2", + "zh:496d06a089b1bc8d60995e8dddfe1d87c605a208f377a60b17987e89381dafda", + "zh:4e9aba435994589befe4279927c71a461a52e6cd96b8f0437295c18c50f6baff", + "zh:71134031288a312db1804d4798b10f106a843c36aafd7b8fe8f4859156d7df93", + "zh:748d0dbdfbe8df4b516a09b23b3981c19cef9a255c1ca0187e84ab424e6bd845", + "zh:783541ff77f4e7c74c817e0e2989ebdb45dd6e2c9853a8cccbcf5f1976736a76", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0a2d4efe2835f0101a0a5024e044a3f28c00e10a8d87fce89c707ef6db75cea", - "zh:aecb3e4b9121771dee9cac7975bf5d0657b5f3e8b57788c455beaeb0f3c48d93", - "zh:d2d3393170b8ef761d3146f39f6788c4a3e876e6c5d4cedca4870c2680688ae6", - "zh:daba5a005c1baa4a5eefbfb86d43ccf880eb5b42e8136f0d932f55886d72bda0", - "zh:de16a6ff3baacdaf9609a0a89aa1913fc19cccaf5ee0fc1c49c5a075baa47c02", + "zh:af3f080975d5ed79917b8238cc0ae3150da688bc89e12dcc3ee85134b29857d0", + "zh:ec542372c3ffbfc3df6966f77357f8af7319d4bd956ff8e9fde0bbd124352e34", + "zh:f3dc7b2b5b55173207c2fd35ed6bb8cc66b06af777e221060ca2f0c0afdecbb5", + "zh:f9631ecc21d6e5cf82ef6ef8d14c39e1dfb2a52cc8f0abb684311885ffdb79a1", ] } diff --git a/terraform/shared/modules/acm-certificate/main.tf b/terraform/shared/modules/acm-certificate/main.tf index 1cdae6ba1..b758fb602 100644 --- a/terraform/shared/modules/acm-certificate/main.tf +++ b/terraform/shared/modules/acm-certificate/main.tf @@ -5,9 +5,8 @@ locals { terraform { required_providers { aws = { - source = "hashicorp/aws" - // Allow both 4.x and 5.x while we upgrade everything to 5.x. - version = ">= 4.20, < 6" + source = "hashicorp/aws" + version = ">= 5.64" } } } diff --git a/terraform/shared/modules/static-website/main.tf b/terraform/shared/modules/static-website/main.tf index fade82ad5..96b96757a 100644 --- a/terraform/shared/modules/static-website/main.tf +++ b/terraform/shared/modules/static-website/main.tf @@ -1,9 +1,8 @@ terraform { required_providers { aws = { - source = "hashicorp/aws" - // Allow both 4.x and 5.x while we upgrade everything to 5.x. - version = ">= 4.28, < 6" + source = "hashicorp/aws" + version = ">= 5.64" } } } From 5dd77142dd97ad0da72800f2c06a6476f4e1559f Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 4 Sep 2024 10:00:14 +0200 Subject: [PATCH 200/217] feat(bors): add health check --- terragrunt/modules/bors/main.tf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/terragrunt/modules/bors/main.tf b/terragrunt/modules/bors/main.tf index 350282648..2961114ee 100644 --- a/terragrunt/modules/bors/main.tf +++ b/terragrunt/modules/bors/main.tf @@ -298,6 +298,12 @@ resource "aws_ecs_task_definition" "bors" { valueFrom = aws_ssm_parameter.db_endpoint.arn } ] + + healthCheck = { + command = ["CMD-SHELL", "curl -f http://localhost:8080/health || exit 1"] + timeout = 10 + startPeriod = 10 + } } ]) } From e3dc1677cfbeea9b63542d58574a5df9d09e465f Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 4 Sep 2024 15:00:11 +0200 Subject: [PATCH 201/217] chore: update to ansible 8 --- ansible/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/requirements.txt b/ansible/requirements.txt index 384ea7c4c..d81fc9cbe 100644 --- a/ansible/requirements.txt +++ b/ansible/requirements.txt @@ -1,3 +1,3 @@ -ansible==7.3.0 +ansible==8.7.0 boto3==1.26.94 passlib==1.7.4 From 5f8bc6822065b10aa5d726410458e8b2337d3c7b Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 4 Sep 2024 18:18:07 +0200 Subject: [PATCH 202/217] fix(ansible): prevent apply script from crashing on mac --- ansible/apply | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ansible/apply b/ansible/apply index 613b1a40e..b471d3db3 100755 --- a/ansible/apply +++ b/ansible/apply @@ -5,6 +5,8 @@ import shutil import subprocess import sys import tempfile +import os +import platform BASE_PATH = pathlib.Path(__file__).resolve().parent VENV_PATH = BASE_PATH / ".venv" @@ -74,7 +76,13 @@ def run_playbook(args): ansible_args += ["-u", args.user] if args.start_at_task is not None: ansible_args += ["--start-at-task", args.start_at_task] - res = subprocess.run(ansible_args, cwd=str(tempdir)) + + env = os.environ.copy() + # Set environment variable if running on macOS to avoid python crash + if platform.system() == "Darwin": + env["OBJC_DISABLE_INITIALIZE_FORK_SAFETY"] = "true" + + res = subprocess.run(ansible_args, cwd=str(tempdir), env=env) if res.returncode != 0: exit(1) finally: From 1cbd74446cbe2979145e0a2cc8c39d449f8e94d5 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 5 Sep 2024 12:45:17 +0200 Subject: [PATCH 203/217] chore(dev-desktops): remove postfix Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> --- ansible/roles/dev-desktop/tasks/dependencies.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible/roles/dev-desktop/tasks/dependencies.yml b/ansible/roles/dev-desktop/tasks/dependencies.yml index 56ca66bff..b97d93cd4 100644 --- a/ansible/roles/dev-desktop/tasks/dependencies.yml +++ b/ansible/roles/dev-desktop/tasks/dependencies.yml @@ -59,6 +59,12 @@ - zsh state: present +# we don't need it because we don't need to send emails +- name: Uninstall postfix + apt: + name: postfix + state: absent + - name: Uninstall fish from apt apt: name: fish From ba38b186ab3f80812c34c988f90df0c20e9dd44f Mon Sep 17 00:00:00 2001 From: nora <48135649+Noratrieb@users.noreply.github.com> Date: Fri, 6 Sep 2024 10:15:59 +0200 Subject: [PATCH 204/217] Add earlyoom to dev desktop (#480) Sometimes the dev desktop just OOMs and dies because someone committed a happy little accident, as one does. Luckily Linux has an OOM killer, sadly it's pretty useless in practice. Luckily there's a userspace workaround! It works really well. --------- Co-authored-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> --- ansible/roles/dev-desktop/tasks/dependencies.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/roles/dev-desktop/tasks/dependencies.yml b/ansible/roles/dev-desktop/tasks/dependencies.yml index b97d93cd4..4e55350ed 100644 --- a/ansible/roles/dev-desktop/tasks/dependencies.yml +++ b/ansible/roles/dev-desktop/tasks/dependencies.yml @@ -16,6 +16,7 @@ - clang - cmake - gcc-mingw-w64-x86-64 # Allows running `x check --target x86_64-pc-windows-gnu` + - earlyoom # Earlyoom kills processes using too much memory before they can cause trouble. - jq - libssl-dev - llvm From 5c4c23a4a4dc7ef40efa2bea34688c695dd91cd4 Mon Sep 17 00:00:00 2001 From: Marco Ieni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 6 Sep 2024 14:32:21 +0200 Subject: [PATCH 205/217] docs: add basic rustup doc (#566) Signed-off-by: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> --- terragrunt/modules/rustup/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 terragrunt/modules/rustup/README.md diff --git a/terragrunt/modules/rustup/README.md b/terragrunt/modules/rustup/README.md new file mode 100644 index 000000000..1768075e2 --- /dev/null +++ b/terragrunt/modules/rustup/README.md @@ -0,0 +1,8 @@ +# Rustup + +An S3 bucket called `rustup-build` for storing the Rustup binaries, +distributed through CloudFront CDN. + +The [rust-lang/rustup](https://github.com/rust-lang/rustup) +GitHub repository builds and uploads Rustup artifacts +to this S3 bucket. From 30294e375f1f3d950842533558b7c26aa29c8951 Mon Sep 17 00:00:00 2001 From: Marco Ieni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 20 Sep 2024 09:48:16 +0200 Subject: [PATCH 206/217] fix: make dev desktops compatible with ubuntu 24 (#562) --- .../dev-desktop/files/podman/storage.conf | 2 ++ .../roles/dev-desktop/tasks/dependencies.yml | 2 +- .../dev-desktop/tasks/fix_llvm_55575.yml | 30 ------------------- ansible/roles/dev-desktop/tasks/main.yml | 1 - 4 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 ansible/roles/dev-desktop/tasks/fix_llvm_55575.yml diff --git a/ansible/roles/dev-desktop/files/podman/storage.conf b/ansible/roles/dev-desktop/files/podman/storage.conf index 6be33d8ec..5ad62a491 100644 --- a/ansible/roles/dev-desktop/files/podman/storage.conf +++ b/ansible/roles/dev-desktop/files/podman/storage.conf @@ -1,5 +1,7 @@ [storage] driver = "overlay" + runroot = "/run/containers/storage" + graphroot = "/var/lib/containers/storage" [storage.options.overlay] mount_program = "/usr/bin/fuse-overlayfs" diff --git a/ansible/roles/dev-desktop/tasks/dependencies.yml b/ansible/roles/dev-desktop/tasks/dependencies.yml index 4e55350ed..c0ba38e31 100644 --- a/ansible/roles/dev-desktop/tasks/dependencies.yml +++ b/ansible/roles/dev-desktop/tasks/dependencies.yml @@ -43,7 +43,7 @@ - libgbm1 - libpango-1.0-0 - libcairo2 - - libasound2 + - libasound2t64 - libatspi2.0-0 - libelf-dev # Allows building tools that link against libelf - libsecret-1-dev # used by cargo diff --git a/ansible/roles/dev-desktop/tasks/fix_llvm_55575.yml b/ansible/roles/dev-desktop/tasks/fix_llvm_55575.yml deleted file mode 100644 index d5b0d28ba..000000000 --- a/ansible/roles/dev-desktop/tasks/fix_llvm_55575.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- - -# lldb 14 fails to load Python modules due to a wrong path. The workaround for -# this issue is to symlink the modules to the path that lldb expects. -# https://github.com/llvm/llvm-project/issues/55575 - -- name: Find all lldb Python files - ansible.builtin.find: - paths: /usr/lib/llvm-14/lib/python3.10/dist-packages/lldb - file_type: file - register: lldb_python_files - -- name: Find all lldb Python modules - ansible.builtin.find: - paths: /usr/lib/llvm-14/lib/python3.10/dist-packages/lldb - file_type: directory - register: lldb_python_directories - -- name: Fix llvm/llvm-project#55575 - ansible.builtin.file: - src: "{{ item.path }}" - dest: "/usr/lib/python3/dist-packages/lldb/{{ item.path | basename }}" - state: link - with_items: "{{ lldb_python_files.files + lldb_python_directories.files }}" - -- name: Fix lldb-server-14.0.0 - ansible.builtin.file: - src: /usr/lib/llvm-14/bin/lldb-server - dest: /usr/bin/lldb-server-14.0.0 - state: link diff --git a/ansible/roles/dev-desktop/tasks/main.yml b/ansible/roles/dev-desktop/tasks/main.yml index 08fd2ac71..dac43d282 100644 --- a/ansible/roles/dev-desktop/tasks/main.yml +++ b/ansible/roles/dev-desktop/tasks/main.yml @@ -12,4 +12,3 @@ - include_tasks: github.yml - include_tasks: motd.yml - include_tasks: scripts.yml -- include_tasks: fix_llvm_55575.yml From 1b5840f4219e5eb79831062dbc19a13d223dfb86 Mon Sep 17 00:00:00 2001 From: Marco Ieni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 20 Sep 2024 11:57:47 +0200 Subject: [PATCH 207/217] chore(release-distribution): update `static-router` to node 20 (#539) --- terragrunt/modules/release-distribution/cloudfront-static.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/modules/release-distribution/cloudfront-static.tf b/terragrunt/modules/release-distribution/cloudfront-static.tf index f809935e5..ac99ca226 100644 --- a/terragrunt/modules/release-distribution/cloudfront-static.tf +++ b/terragrunt/modules/release-distribution/cloudfront-static.tf @@ -7,7 +7,7 @@ module "lambda_static" { name = "${local.name}--static-router" source_dir = "lambdas/static-router" handler = "index.handler" - runtime = "nodejs16.x" + runtime = "nodejs20.x" role_arn = data.aws_iam_role.cloudfront_lambda.arn } From a26fb7432b949e0c4f27c7ce82570466f1cbd15e Mon Sep 17 00:00:00 2001 From: Marco Ieni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 20 Sep 2024 12:02:09 +0200 Subject: [PATCH 208/217] chore: update releases-prod ref to update nodejs runtime (#569) --- terragrunt/accounts/legacy/releases-prod/deployed-ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/accounts/legacy/releases-prod/deployed-ref b/terragrunt/accounts/legacy/releases-prod/deployed-ref index 2f50e8fec..20ebe2e3e 100644 --- a/terragrunt/accounts/legacy/releases-prod/deployed-ref +++ b/terragrunt/accounts/legacy/releases-prod/deployed-ref @@ -1 +1 @@ -4288556792b72d55e7e6d0584bc37472644a4f57 +1b5840f4219e5eb79831062dbc19a13d223dfb86 From 781f7f29a1009bf7abaed8aa06c99abf28533f88 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 20 Sep 2024 12:04:57 +0200 Subject: [PATCH 209/217] chore(release-distribution): update `doc-router` to node 20 --- terragrunt/modules/release-distribution/cloudfront-doc.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/modules/release-distribution/cloudfront-doc.tf b/terragrunt/modules/release-distribution/cloudfront-doc.tf index 1537e8718..d03c9df66 100644 --- a/terragrunt/modules/release-distribution/cloudfront-doc.tf +++ b/terragrunt/modules/release-distribution/cloudfront-doc.tf @@ -7,7 +7,7 @@ module "lambda_doc_router" { name = "${local.name}--doc-router" source_dir = "lambdas/doc-router" handler = "index.handler" - runtime = "nodejs16.x" + runtime = "nodejs20.x" role_arn = data.aws_iam_role.cloudfront_lambda.arn } From 1a259eea6062160496987742704e49b1ba94a75d Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 20 Sep 2024 12:08:36 +0200 Subject: [PATCH 210/217] update deployed ref --- terragrunt/accounts/legacy/releases-prod/deployed-ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/accounts/legacy/releases-prod/deployed-ref b/terragrunt/accounts/legacy/releases-prod/deployed-ref index 20ebe2e3e..74cc47ba9 100644 --- a/terragrunt/accounts/legacy/releases-prod/deployed-ref +++ b/terragrunt/accounts/legacy/releases-prod/deployed-ref @@ -1 +1 @@ -1b5840f4219e5eb79831062dbc19a13d223dfb86 +781f7f29a1009bf7abaed8aa06c99abf28533f88 From f94a653acbaf020a917249a435b3515cd41baae6 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 20 Sep 2024 12:18:35 +0200 Subject: [PATCH 211/217] docs: document releases-distribution lambdas --- terragrunt/modules/release-distribution/README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/terragrunt/modules/release-distribution/README.md b/terragrunt/modules/release-distribution/README.md index 85899502b..4ba936303 100644 --- a/terragrunt/modules/release-distribution/README.md +++ b/terragrunt/modules/release-distribution/README.md @@ -11,3 +11,14 @@ distribution of traffic between CloudFront and Fastly. If you want to use a specific CDN, use `fastly-static.rust-lang.org` or `cloudfront-static.rust-lang.org`. The Fastly CDN is configured via the VCL language, while the CloudFront CDN is configured via Javascript AWS lambda functions. + +## Lambdas + +The following lambdas manage requests starting with the following URLs: + +- [doc-router](./lambdas/doc-router/index.js): + - dev: dev-doc.rust-lang.org + - prod: doc.rust-lang.org +- [static-router](./lambdas/static-router/index.js): + - dev: dev-static.rust-lang.org + - prod: static.rust-lang.org From a043aeb0ea1997f0c79d81bba5cd70d3a24a144e Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:06:35 +0200 Subject: [PATCH 212/217] feat(dev-desktops): add gdb --- ansible/roles/dev-desktop/tasks/dependencies.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/roles/dev-desktop/tasks/dependencies.yml b/ansible/roles/dev-desktop/tasks/dependencies.yml index c0ba38e31..aecada3c6 100644 --- a/ansible/roles/dev-desktop/tasks/dependencies.yml +++ b/ansible/roles/dev-desktop/tasks/dependencies.yml @@ -52,6 +52,7 @@ - lld - lldb - mold + - gdb - neovim - parallel # Necessary for building rr From 321228e8cd2d752f84de434dd869b8b36f938d55 Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 11 Sep 2024 09:53:59 -0400 Subject: [PATCH 213/217] Update log format for release service on Fastly The log format of the Fastly service for releases has been slightly changed to set Datadog's unified tags[^1]. This makes it easier to work with the logs in Datadog's UI. [^1]: https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging --- .../modules/release-distribution/fastly-log-format.tftpl | 1 + terragrunt/modules/release-distribution/fastly-static.tf | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 terragrunt/modules/release-distribution/fastly-log-format.tftpl diff --git a/terragrunt/modules/release-distribution/fastly-log-format.tftpl b/terragrunt/modules/release-distribution/fastly-log-format.tftpl new file mode 100644 index 000000000..1db96d055 --- /dev/null +++ b/terragrunt/modules/release-distribution/fastly-log-format.tftpl @@ -0,0 +1 @@ +{ "ddsource": "fastly", "ddtags": "app:${dd_app},env:${dd_env}", "service": "${service_name}", "date": "%%{begin:%Y-%m-%dT%H:%M:%S%Z}t", "time_start": "%%{begin:%Y-%m-%dT%H:%M:%S%Z}t", "time_end": "%%{end:%Y-%m-%dT%H:%M:%S%Z}t", "http": { "request_time_ms": %D, "method": "%m", "url": "%%{json.escape(req.url)}V", "useragent": "%%{User-Agent}i", "referer": "%%{Referer}i", "protocol": "%H", "request_x_forwarded_for": "%%{X-Forwarded-For}i", "status_code": "%s" }, "network": { "client": { "ip": "%h", "name": "%%{client.as.name}V", "number": "%%{client.as.number}V", "connection_speed": "%%{client.geo.conn_speed}V" }, "destination": { "ip": "%A" }, "geoip": { "geo_city": "%%{client.geo.city.utf8}V", "geo_country_code": "%%{client.geo.country_code}V", "geo_continent_code": "%%{client.geo.continent_code}V", "geo_region": "%%{client.geo.region}V" }, "bytes_written": %B, "bytes_read": %%{req.body_bytes_read}V }, "host": "%%{Fastly-Orig-Host}i", "origin_host": "%v", "is_ipv6": %%{if(req.is_ipv6, "true", "false")}V, "is_tls": %%{if(req.is_ssl, "true", "false")}V, "tls_client_protocol": "%%{json.escape(tls.client.protocol)}V", "tls_client_servername": "%%{json.escape(tls.client.servername)}V", "tls_client_cipher": "%%{json.escape(tls.client.cipher)}V", "tls_client_cipher_sha": "%%{json.escape(tls.client.ciphers_sha)}V", "tls_client_tlsexts_sha": "%%{json.escape(tls.client.tlsexts_sha)}V", "is_h2": %%{if(fastly_info.is_h2, "true", "false")}V, "is_h2_push": %%{if(fastly_info.h2.is_push, "true", "false")}V, "h2_stream_id": "%%{fastly_info.h2.stream_id}V", "request_accept_content": "%%{Accept}i", "request_accept_language": "%%{Accept-Language}i", "request_accept_encoding": "%%{Accept-Encoding}i", "request_accept_charset": "%%{Accept-Charset}i", "request_connection": "%%{Connection}i", "request_dnt": "%%{DNT}i", "request_forwarded": "%%{Forwarded}i", "request_via": "%%{Via}i", "request_cache_control": "%%{Cache-Control}i", "request_x_requested_with": "%%{X-Requested-With}i", "request_x_att_device_id": "%%{X-ATT-Device-Id}i", "content_type": "%%{Content-Type}o", "is_cacheable": %%{if(fastly_info.state~"^(HIT|MISS)$", "true","false")}V, "response_age": "%%{Age}o", "response_cache_control": "%%{Cache-Control}o", "response_expires": "%%{Expires}o", "response_last_modified": "%%{Last-Modified}o", "response_tsv": "%%{TSV}o", "server_datacenter": "%%{server.datacenter}V", "req_header_size": %%{req.header_bytes_read}V, "resp_header_size": %%{resp.header_bytes_written}V, "socket_cwnd": %%{client.socket.cwnd}V, "socket_nexthop": "%%{client.socket.nexthop}V", "socket_tcpi_rcv_mss": %%{client.socket.tcpi_rcv_mss}V, "socket_tcpi_snd_mss": %%{client.socket.tcpi_snd_mss}V, "socket_tcpi_rtt": %%{client.socket.tcpi_rtt}V, "socket_tcpi_rttvar": %%{client.socket.tcpi_rttvar}V, "socket_tcpi_rcv_rtt": %%{client.socket.tcpi_rcv_rtt}V, "socket_tcpi_rcv_space": %%{client.socket.tcpi_rcv_space}V, "socket_tcpi_last_data_sent": %%{client.socket.tcpi_last_data_sent}V, "socket_tcpi_total_retrans": %%{client.socket.tcpi_total_retrans}V, "socket_tcpi_delta_retrans": %%{client.socket.tcpi_delta_retrans}V, "socket_ploss": %%{client.socket.ploss}V } diff --git a/terragrunt/modules/release-distribution/fastly-static.tf b/terragrunt/modules/release-distribution/fastly-static.tf index c5d4592b0..c4f056032 100644 --- a/terragrunt/modules/release-distribution/fastly-static.tf +++ b/terragrunt/modules/release-distribution/fastly-static.tf @@ -118,6 +118,12 @@ resource "fastly_service_vcl" "static" { logging_datadog { name = "datadog" token = data.aws_ssm_parameter.datadog_api_key.value + + format = templatefile("${path.module}/fastly-log-format.tftpl", { + dd_app = "releases", + dd_env = var.environment, + service_name = var.static_domain_name, + }) } logging_s3 { From 47567e5d03b9c0c1fde3cd5219f048da18aaf4e8 Mon Sep 17 00:00:00 2001 From: Jan David Date: Wed, 11 Sep 2024 16:13:26 -0400 Subject: [PATCH 214/217] Deploy new log format to production --- terragrunt/accounts/legacy/releases-prod/deployed-ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/accounts/legacy/releases-prod/deployed-ref b/terragrunt/accounts/legacy/releases-prod/deployed-ref index 74cc47ba9..749472584 100644 --- a/terragrunt/accounts/legacy/releases-prod/deployed-ref +++ b/terragrunt/accounts/legacy/releases-prod/deployed-ref @@ -1 +1 @@ -781f7f29a1009bf7abaed8aa06c99abf28533f88 +321228e8cd2d752f84de434dd869b8b36f938d55 From 3f120c2eb194cc0d15a52d950f43ae9104b6dfd1 Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 12 Sep 2024 12:46:26 -0400 Subject: [PATCH 215/217] Hard-code service name for Datadog We use a hierarchy of tags on Datadog to provide different means for filtering metrics and logs. All logs from a particular piece of infrastructure share the same `service` tag and then have different tags for the `env`. In this specific case, we want to tag everything as coming from the `static.rust-lang.org` service and then differentiate between the environments using the `dev` and `prod` valus for the environment. --- terragrunt/modules/release-distribution/fastly-static.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/modules/release-distribution/fastly-static.tf b/terragrunt/modules/release-distribution/fastly-static.tf index c4f056032..e3a21fe99 100644 --- a/terragrunt/modules/release-distribution/fastly-static.tf +++ b/terragrunt/modules/release-distribution/fastly-static.tf @@ -120,9 +120,9 @@ resource "fastly_service_vcl" "static" { token = data.aws_ssm_parameter.datadog_api_key.value format = templatefile("${path.module}/fastly-log-format.tftpl", { + service_name = "static.rust-lang.org" dd_app = "releases", dd_env = var.environment, - service_name = var.static_domain_name, }) } From e8a249616c13651c14c2f8c0241c466b436489c4 Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 12 Sep 2024 13:08:03 -0400 Subject: [PATCH 216/217] Populate host attribute in Fastly logs The `host` attribute in the logs was not set properly, but is now being populated properly based in different information available in Fastly. --- terragrunt/modules/release-distribution/fastly-log-format.tftpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/modules/release-distribution/fastly-log-format.tftpl b/terragrunt/modules/release-distribution/fastly-log-format.tftpl index 1db96d055..411dae6f3 100644 --- a/terragrunt/modules/release-distribution/fastly-log-format.tftpl +++ b/terragrunt/modules/release-distribution/fastly-log-format.tftpl @@ -1 +1 @@ -{ "ddsource": "fastly", "ddtags": "app:${dd_app},env:${dd_env}", "service": "${service_name}", "date": "%%{begin:%Y-%m-%dT%H:%M:%S%Z}t", "time_start": "%%{begin:%Y-%m-%dT%H:%M:%S%Z}t", "time_end": "%%{end:%Y-%m-%dT%H:%M:%S%Z}t", "http": { "request_time_ms": %D, "method": "%m", "url": "%%{json.escape(req.url)}V", "useragent": "%%{User-Agent}i", "referer": "%%{Referer}i", "protocol": "%H", "request_x_forwarded_for": "%%{X-Forwarded-For}i", "status_code": "%s" }, "network": { "client": { "ip": "%h", "name": "%%{client.as.name}V", "number": "%%{client.as.number}V", "connection_speed": "%%{client.geo.conn_speed}V" }, "destination": { "ip": "%A" }, "geoip": { "geo_city": "%%{client.geo.city.utf8}V", "geo_country_code": "%%{client.geo.country_code}V", "geo_continent_code": "%%{client.geo.continent_code}V", "geo_region": "%%{client.geo.region}V" }, "bytes_written": %B, "bytes_read": %%{req.body_bytes_read}V }, "host": "%%{Fastly-Orig-Host}i", "origin_host": "%v", "is_ipv6": %%{if(req.is_ipv6, "true", "false")}V, "is_tls": %%{if(req.is_ssl, "true", "false")}V, "tls_client_protocol": "%%{json.escape(tls.client.protocol)}V", "tls_client_servername": "%%{json.escape(tls.client.servername)}V", "tls_client_cipher": "%%{json.escape(tls.client.cipher)}V", "tls_client_cipher_sha": "%%{json.escape(tls.client.ciphers_sha)}V", "tls_client_tlsexts_sha": "%%{json.escape(tls.client.tlsexts_sha)}V", "is_h2": %%{if(fastly_info.is_h2, "true", "false")}V, "is_h2_push": %%{if(fastly_info.h2.is_push, "true", "false")}V, "h2_stream_id": "%%{fastly_info.h2.stream_id}V", "request_accept_content": "%%{Accept}i", "request_accept_language": "%%{Accept-Language}i", "request_accept_encoding": "%%{Accept-Encoding}i", "request_accept_charset": "%%{Accept-Charset}i", "request_connection": "%%{Connection}i", "request_dnt": "%%{DNT}i", "request_forwarded": "%%{Forwarded}i", "request_via": "%%{Via}i", "request_cache_control": "%%{Cache-Control}i", "request_x_requested_with": "%%{X-Requested-With}i", "request_x_att_device_id": "%%{X-ATT-Device-Id}i", "content_type": "%%{Content-Type}o", "is_cacheable": %%{if(fastly_info.state~"^(HIT|MISS)$", "true","false")}V, "response_age": "%%{Age}o", "response_cache_control": "%%{Cache-Control}o", "response_expires": "%%{Expires}o", "response_last_modified": "%%{Last-Modified}o", "response_tsv": "%%{TSV}o", "server_datacenter": "%%{server.datacenter}V", "req_header_size": %%{req.header_bytes_read}V, "resp_header_size": %%{resp.header_bytes_written}V, "socket_cwnd": %%{client.socket.cwnd}V, "socket_nexthop": "%%{client.socket.nexthop}V", "socket_tcpi_rcv_mss": %%{client.socket.tcpi_rcv_mss}V, "socket_tcpi_snd_mss": %%{client.socket.tcpi_snd_mss}V, "socket_tcpi_rtt": %%{client.socket.tcpi_rtt}V, "socket_tcpi_rttvar": %%{client.socket.tcpi_rttvar}V, "socket_tcpi_rcv_rtt": %%{client.socket.tcpi_rcv_rtt}V, "socket_tcpi_rcv_space": %%{client.socket.tcpi_rcv_space}V, "socket_tcpi_last_data_sent": %%{client.socket.tcpi_last_data_sent}V, "socket_tcpi_total_retrans": %%{client.socket.tcpi_total_retrans}V, "socket_tcpi_delta_retrans": %%{client.socket.tcpi_delta_retrans}V, "socket_ploss": %%{client.socket.ploss}V } +{ "ddsource": "fastly", "ddtags": "app:${dd_app},env:${dd_env}", "service": "${service_name}", "date": "%%{begin:%Y-%m-%dT%H:%M:%S%Z}t", "time_start": "%%{begin:%Y-%m-%dT%H:%M:%S%Z}t", "time_end": "%%{end:%Y-%m-%dT%H:%M:%S%Z}t", "http": { "request_time_ms": %D, "method": "%m", "url": "%%{json.escape(req.url)}V", "useragent": "%%{User-Agent}i", "referer": "%%{Referer}i", "protocol": "%H", "request_x_forwarded_for": "%%{X-Forwarded-For}i", "status_code": "%s" }, "network": { "client": { "ip": "%h", "name": "%%{client.as.name}V", "number": "%%{client.as.number}V", "connection_speed": "%%{client.geo.conn_speed}V" }, "destination": { "ip": "%A" }, "geoip": { "geo_city": "%%{client.geo.city.utf8}V", "geo_country_code": "%%{client.geo.country_code}V", "geo_continent_code": "%%{client.geo.continent_code}V", "geo_region": "%%{client.geo.region}V" }, "bytes_written": %B, "bytes_read": %%{req.body_bytes_read}V }, "host": "%%{if(req.http.Fastly-Orig-Host, req.http.Fastly-Orig-Host, req.http.Host)}V", "origin_host": "%v", "is_ipv6": %%{if(req.is_ipv6, "true", "false")}V, "is_tls": %%{if(req.is_ssl, "true", "false")}V, "tls_client_protocol": "%%{json.escape(tls.client.protocol)}V", "tls_client_servername": "%%{json.escape(tls.client.servername)}V", "tls_client_cipher": "%%{json.escape(tls.client.cipher)}V", "tls_client_cipher_sha": "%%{json.escape(tls.client.ciphers_sha)}V", "tls_client_tlsexts_sha": "%%{json.escape(tls.client.tlsexts_sha)}V", "is_h2": %%{if(fastly_info.is_h2, "true", "false")}V, "is_h2_push": %%{if(fastly_info.h2.is_push, "true", "false")}V, "h2_stream_id": "%%{fastly_info.h2.stream_id}V", "request_accept_content": "%%{Accept}i", "request_accept_language": "%%{Accept-Language}i", "request_accept_encoding": "%%{Accept-Encoding}i", "request_accept_charset": "%%{Accept-Charset}i", "request_connection": "%%{Connection}i", "request_dnt": "%%{DNT}i", "request_forwarded": "%%{Forwarded}i", "request_via": "%%{Via}i", "request_cache_control": "%%{Cache-Control}i", "request_x_requested_with": "%%{X-Requested-With}i", "request_x_att_device_id": "%%{X-ATT-Device-Id}i", "content_type": "%%{Content-Type}o", "is_cacheable": %%{if(fastly_info.state~"^(HIT|MISS)$", "true","false")}V, "response_age": "%%{Age}o", "response_cache_control": "%%{Cache-Control}o", "response_expires": "%%{Expires}o", "response_last_modified": "%%{Last-Modified}o", "response_tsv": "%%{TSV}o", "server_datacenter": "%%{server.datacenter}V", "req_header_size": %%{req.header_bytes_read}V, "resp_header_size": %%{resp.header_bytes_written}V, "socket_cwnd": %%{client.socket.cwnd}V, "socket_nexthop": "%%{client.socket.nexthop}V", "socket_tcpi_rcv_mss": %%{client.socket.tcpi_rcv_mss}V, "socket_tcpi_snd_mss": %%{client.socket.tcpi_snd_mss}V, "socket_tcpi_rtt": %%{client.socket.tcpi_rtt}V, "socket_tcpi_rttvar": %%{client.socket.tcpi_rttvar}V, "socket_tcpi_rcv_rtt": %%{client.socket.tcpi_rcv_rtt}V, "socket_tcpi_rcv_space": %%{client.socket.tcpi_rcv_space}V, "socket_tcpi_last_data_sent": %%{client.socket.tcpi_last_data_sent}V, "socket_tcpi_total_retrans": %%{client.socket.tcpi_total_retrans}V, "socket_tcpi_delta_retrans": %%{client.socket.tcpi_delta_retrans}V, "socket_ploss": %%{client.socket.ploss}V } From 132eb89d1faad66ca62c228d3321ab44666f61f2 Mon Sep 17 00:00:00 2001 From: Jan David Date: Thu, 12 Sep 2024 13:17:42 -0400 Subject: [PATCH 217/217] Deploy updated log format to production --- terragrunt/accounts/legacy/releases-prod/deployed-ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/accounts/legacy/releases-prod/deployed-ref b/terragrunt/accounts/legacy/releases-prod/deployed-ref index 749472584..34cf023b1 100644 --- a/terragrunt/accounts/legacy/releases-prod/deployed-ref +++ b/terragrunt/accounts/legacy/releases-prod/deployed-ref @@ -1 +1 @@ -321228e8cd2d752f84de434dd869b8b36f938d55 +e8a249616c13651c14c2f8c0241c466b436489c4