diff --git a/.github/workflows/gcp-dev-destroy.yml b/.github/workflows/gcp-dev-destroy.yml index 36b9eabb1..c5ae647da 100644 --- a/.github/workflows/gcp-dev-destroy.yml +++ b/.github/workflows/gcp-dev-destroy.yml @@ -280,15 +280,18 @@ jobs: - name: Terraform destroy working-directory: ${{ env.TF_DIR }} - # Cloud SQL, Memorystore, and GKE can report deletion complete before - # Service Networking and load-balancer dependencies observe the release. - # Re-running destroy is idempotent and lets those provider-side links - # converge without requiring out-of-band resource deletion. + # GKE and load-balancer dependencies can report deletion complete before + # dependent resources observe the release. Re-running destroy is + # idempotent and lets those provider-side links converge without + # out-of-band resource deletion. The Service Networking connection is + # not handled by this loop: its producer-held peering is released by + # deletion_policy = "REMOVE_PEERING" in modules/portal/vpc, because + # retrying the default delete keeps failing after Cloud SQL and + # Memorystore are gone. run: | set -euo pipefail - # Five backoff intervals (1+2+3+4+5 minutes) cover the observed - # Service Networking producer-detachment window without retrying - # indefinitely. + # Five backoff intervals (1+2+3+4+5 minutes) bound the retries for + # transient dependency convergence without retrying indefinitely. max_attempts=6 for attempt in $(seq 1 "${max_attempts}"); do if terraform destroy -auto-approve; then diff --git a/platform/terraform/gcp/environments/balrog/.terraform.lock.hcl b/platform/terraform/gcp/environments/balrog/.terraform.lock.hcl index add4264e1..7c89ad99b 100644 --- a/platform/terraform/gcp/environments/balrog/.terraform.lock.hcl +++ b/platform/terraform/gcp/environments/balrog/.terraform.lock.hcl @@ -22,42 +22,42 @@ provider "registry.terraform.io/hashicorp/archive" { } provider "registry.terraform.io/hashicorp/google" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:faTJQOetP9/RYuHwA3r2SWnuYoyzQNm4tUWZrZggcgY=", - "zh:1f3513fcfcbf7ca53d667a168c5067a4dd91a4d4cccd19743e248ff31065503c", - "zh:3da7db8fc2c51a77dd958ea8baaa05c29cd7f829bd8941c26e2ea9cb3aadc1e5", - "zh:3e09ac3f6ca8111cbb659d38c251771829f4347ab159a12db195e211c76068bb", - "zh:7bb9e41c568df15ccf1a8946037355eefb4dfb4e35e3b190808bb7c4abae547d", - "zh:81e5d78bdec7778e6d67b5c3544777505db40a826b6eb5abe9b86d4ba396866b", - "zh:8d309d020fb321525883f5c4ea864df3d5942b6087f6656d6d8b3a1377f340fc", - "zh:93e112559655ab95a523193158f4a4ac0f2bfed7eeaa712010b85ebb551d5071", - "zh:d3efe589ffd625b300cef5917c4629513f77e3a7b111c9df65075f76a46a63c7", - "zh:d4a4d672bbef756a870d8f32b35925f8ce2ef4f6bbd5b71a3cb764f1b6c85421", - "zh:e13a86bca299ba8a118e80d5f84fbdd708fe600ecdceea1a13d4919c068379fe", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fec30c095647b583a246c39d557704947195a1b7d41f81e369ba377d997faef6", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:uxh4ME3hhSzVjmiWgA1IQqYqg25MV6FMVArHyA6Ki5o=", - "zh:18b442bd0a05321d39dda1e9e3f1bdede4e61bc2ac62cc7a67037a3864f75101", - "zh:2e387c51455862828bec923a3ec81abf63a4d998da470cf00e09003bda53d668", - "zh:3942e708fa84ebe54996086f4b1398cb747fe19cbcd0be07ace528291fb35dee", - "zh:496287dd48b34ae6197cb1f887abeafd07c33f389dbe431bb01e24846754cfdd", - "zh:6eca885419969ce5c2a706f34dce1f10bde9774757675f2d8a92d12e5a1be390", - "zh:710dbef826c3fe7f76f844dae47937e8e4c1279dd9205ec4610be04cf3327244", - "zh:777ebf44b24bfc7bdbf770dc089f1a72f143b4718fdedb8c6bd75983115a1ec2", - "zh:9c8703bba37b8c7ad857efc3513392c5a096c519397c1cb822d7612f38e4262f", - "zh:c4f1d3a73de2702277c99d5348ad6d374705bcfdd367ad964ff4cfd2cf06c281", - "zh:eca8df11af3f5a948492d5b8b5d01b4ec705aad10bc30ec1524205508ae28393", - "zh:f41e7fd5f2628e8fd6b8ea136366923858f54428d1729898925469b862c275c2", + "h1:XkjlBJkEMNY+bcst7vAaPVdLbS7Xpv2nykUIvUnEf44=", + "zh:00777505d2bc229092a1ce7aee182cadac994e386aee89f480231e886e8a9ffb", + "zh:097d0f3a8af2779a1f061f6a73004dac096a2117ca03900900ab8ca09add4d59", + "zh:4fe838367f02b50afa24a6aac3f3e217684cea82f2ac74e44c9f98858113e1e9", + "zh:697708c36cf8d855deb751e944ec53e9c0da362fdeb11f9290834c5008f04caf", + "zh:706939b2bc86a03c7b53115088873bf1d361c2fe150b7190351ae2241d6ef3f2", + "zh:7e761e31836a9d2e20c550236955859756122764d9346039825a4e259d9132f8", + "zh:83139a68790b5307c2b5de18dec77d8833b74ace2cec1b00c40bb707a118481d", + "zh:8b36bcb0a49582a6af8b4eec3ae7f02bc2e65ab9fd022dc9ede5ed64d9bf11cd", + "zh:a0e7b2780309f772c79d2ef303bf2021b49f73c78fa318388e283dc86577be70", + "zh:b86244f33a214e7438f54f314c8dea3554f9318044d313f204e410a03c41d512", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f8dbc327c1a6bb2698da1a4b0c7f0da868c33342f1ff2fb636b74c692f0ed8ed", ] } diff --git a/platform/terraform/gcp/environments/balrog/main.tf b/platform/terraform/gcp/environments/balrog/main.tf index 22a2ad1a6..06ada9c0e 100644 --- a/platform/terraform/gcp/environments/balrog/main.tf +++ b/platform/terraform/gcp/environments/balrog/main.tf @@ -8,11 +8,11 @@ terraform { } google = { source = "hashicorp/google" - version = "~> 6.0" + version = "~> 8.1" } google-beta = { source = "hashicorp/google-beta" - version = "~> 6.0" + version = "~> 8.1" } random = { source = "hashicorp/random" diff --git a/platform/terraform/gcp/environments/gcp-dev/.terraform.lock.hcl b/platform/terraform/gcp/environments/gcp-dev/.terraform.lock.hcl index add4264e1..7c89ad99b 100644 --- a/platform/terraform/gcp/environments/gcp-dev/.terraform.lock.hcl +++ b/platform/terraform/gcp/environments/gcp-dev/.terraform.lock.hcl @@ -22,42 +22,42 @@ provider "registry.terraform.io/hashicorp/archive" { } provider "registry.terraform.io/hashicorp/google" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:faTJQOetP9/RYuHwA3r2SWnuYoyzQNm4tUWZrZggcgY=", - "zh:1f3513fcfcbf7ca53d667a168c5067a4dd91a4d4cccd19743e248ff31065503c", - "zh:3da7db8fc2c51a77dd958ea8baaa05c29cd7f829bd8941c26e2ea9cb3aadc1e5", - "zh:3e09ac3f6ca8111cbb659d38c251771829f4347ab159a12db195e211c76068bb", - "zh:7bb9e41c568df15ccf1a8946037355eefb4dfb4e35e3b190808bb7c4abae547d", - "zh:81e5d78bdec7778e6d67b5c3544777505db40a826b6eb5abe9b86d4ba396866b", - "zh:8d309d020fb321525883f5c4ea864df3d5942b6087f6656d6d8b3a1377f340fc", - "zh:93e112559655ab95a523193158f4a4ac0f2bfed7eeaa712010b85ebb551d5071", - "zh:d3efe589ffd625b300cef5917c4629513f77e3a7b111c9df65075f76a46a63c7", - "zh:d4a4d672bbef756a870d8f32b35925f8ce2ef4f6bbd5b71a3cb764f1b6c85421", - "zh:e13a86bca299ba8a118e80d5f84fbdd708fe600ecdceea1a13d4919c068379fe", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fec30c095647b583a246c39d557704947195a1b7d41f81e369ba377d997faef6", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:uxh4ME3hhSzVjmiWgA1IQqYqg25MV6FMVArHyA6Ki5o=", - "zh:18b442bd0a05321d39dda1e9e3f1bdede4e61bc2ac62cc7a67037a3864f75101", - "zh:2e387c51455862828bec923a3ec81abf63a4d998da470cf00e09003bda53d668", - "zh:3942e708fa84ebe54996086f4b1398cb747fe19cbcd0be07ace528291fb35dee", - "zh:496287dd48b34ae6197cb1f887abeafd07c33f389dbe431bb01e24846754cfdd", - "zh:6eca885419969ce5c2a706f34dce1f10bde9774757675f2d8a92d12e5a1be390", - "zh:710dbef826c3fe7f76f844dae47937e8e4c1279dd9205ec4610be04cf3327244", - "zh:777ebf44b24bfc7bdbf770dc089f1a72f143b4718fdedb8c6bd75983115a1ec2", - "zh:9c8703bba37b8c7ad857efc3513392c5a096c519397c1cb822d7612f38e4262f", - "zh:c4f1d3a73de2702277c99d5348ad6d374705bcfdd367ad964ff4cfd2cf06c281", - "zh:eca8df11af3f5a948492d5b8b5d01b4ec705aad10bc30ec1524205508ae28393", - "zh:f41e7fd5f2628e8fd6b8ea136366923858f54428d1729898925469b862c275c2", + "h1:XkjlBJkEMNY+bcst7vAaPVdLbS7Xpv2nykUIvUnEf44=", + "zh:00777505d2bc229092a1ce7aee182cadac994e386aee89f480231e886e8a9ffb", + "zh:097d0f3a8af2779a1f061f6a73004dac096a2117ca03900900ab8ca09add4d59", + "zh:4fe838367f02b50afa24a6aac3f3e217684cea82f2ac74e44c9f98858113e1e9", + "zh:697708c36cf8d855deb751e944ec53e9c0da362fdeb11f9290834c5008f04caf", + "zh:706939b2bc86a03c7b53115088873bf1d361c2fe150b7190351ae2241d6ef3f2", + "zh:7e761e31836a9d2e20c550236955859756122764d9346039825a4e259d9132f8", + "zh:83139a68790b5307c2b5de18dec77d8833b74ace2cec1b00c40bb707a118481d", + "zh:8b36bcb0a49582a6af8b4eec3ae7f02bc2e65ab9fd022dc9ede5ed64d9bf11cd", + "zh:a0e7b2780309f772c79d2ef303bf2021b49f73c78fa318388e283dc86577be70", + "zh:b86244f33a214e7438f54f314c8dea3554f9318044d313f204e410a03c41d512", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f8dbc327c1a6bb2698da1a4b0c7f0da868c33342f1ff2fb636b74c692f0ed8ed", ] } diff --git a/platform/terraform/gcp/environments/gcp-dev/main.tf b/platform/terraform/gcp/environments/gcp-dev/main.tf index 22a2ad1a6..06ada9c0e 100644 --- a/platform/terraform/gcp/environments/gcp-dev/main.tf +++ b/platform/terraform/gcp/environments/gcp-dev/main.tf @@ -8,11 +8,11 @@ terraform { } google = { source = "hashicorp/google" - version = "~> 6.0" + version = "~> 8.1" } google-beta = { source = "hashicorp/google-beta" - version = "~> 6.0" + version = "~> 8.1" } random = { source = "hashicorp/random" diff --git a/platform/terraform/gcp/environments/nazgul/.terraform.lock.hcl b/platform/terraform/gcp/environments/nazgul/.terraform.lock.hcl index add4264e1..7c89ad99b 100644 --- a/platform/terraform/gcp/environments/nazgul/.terraform.lock.hcl +++ b/platform/terraform/gcp/environments/nazgul/.terraform.lock.hcl @@ -22,42 +22,42 @@ provider "registry.terraform.io/hashicorp/archive" { } provider "registry.terraform.io/hashicorp/google" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:faTJQOetP9/RYuHwA3r2SWnuYoyzQNm4tUWZrZggcgY=", - "zh:1f3513fcfcbf7ca53d667a168c5067a4dd91a4d4cccd19743e248ff31065503c", - "zh:3da7db8fc2c51a77dd958ea8baaa05c29cd7f829bd8941c26e2ea9cb3aadc1e5", - "zh:3e09ac3f6ca8111cbb659d38c251771829f4347ab159a12db195e211c76068bb", - "zh:7bb9e41c568df15ccf1a8946037355eefb4dfb4e35e3b190808bb7c4abae547d", - "zh:81e5d78bdec7778e6d67b5c3544777505db40a826b6eb5abe9b86d4ba396866b", - "zh:8d309d020fb321525883f5c4ea864df3d5942b6087f6656d6d8b3a1377f340fc", - "zh:93e112559655ab95a523193158f4a4ac0f2bfed7eeaa712010b85ebb551d5071", - "zh:d3efe589ffd625b300cef5917c4629513f77e3a7b111c9df65075f76a46a63c7", - "zh:d4a4d672bbef756a870d8f32b35925f8ce2ef4f6bbd5b71a3cb764f1b6c85421", - "zh:e13a86bca299ba8a118e80d5f84fbdd708fe600ecdceea1a13d4919c068379fe", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fec30c095647b583a246c39d557704947195a1b7d41f81e369ba377d997faef6", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:uxh4ME3hhSzVjmiWgA1IQqYqg25MV6FMVArHyA6Ki5o=", - "zh:18b442bd0a05321d39dda1e9e3f1bdede4e61bc2ac62cc7a67037a3864f75101", - "zh:2e387c51455862828bec923a3ec81abf63a4d998da470cf00e09003bda53d668", - "zh:3942e708fa84ebe54996086f4b1398cb747fe19cbcd0be07ace528291fb35dee", - "zh:496287dd48b34ae6197cb1f887abeafd07c33f389dbe431bb01e24846754cfdd", - "zh:6eca885419969ce5c2a706f34dce1f10bde9774757675f2d8a92d12e5a1be390", - "zh:710dbef826c3fe7f76f844dae47937e8e4c1279dd9205ec4610be04cf3327244", - "zh:777ebf44b24bfc7bdbf770dc089f1a72f143b4718fdedb8c6bd75983115a1ec2", - "zh:9c8703bba37b8c7ad857efc3513392c5a096c519397c1cb822d7612f38e4262f", - "zh:c4f1d3a73de2702277c99d5348ad6d374705bcfdd367ad964ff4cfd2cf06c281", - "zh:eca8df11af3f5a948492d5b8b5d01b4ec705aad10bc30ec1524205508ae28393", - "zh:f41e7fd5f2628e8fd6b8ea136366923858f54428d1729898925469b862c275c2", + "h1:XkjlBJkEMNY+bcst7vAaPVdLbS7Xpv2nykUIvUnEf44=", + "zh:00777505d2bc229092a1ce7aee182cadac994e386aee89f480231e886e8a9ffb", + "zh:097d0f3a8af2779a1f061f6a73004dac096a2117ca03900900ab8ca09add4d59", + "zh:4fe838367f02b50afa24a6aac3f3e217684cea82f2ac74e44c9f98858113e1e9", + "zh:697708c36cf8d855deb751e944ec53e9c0da362fdeb11f9290834c5008f04caf", + "zh:706939b2bc86a03c7b53115088873bf1d361c2fe150b7190351ae2241d6ef3f2", + "zh:7e761e31836a9d2e20c550236955859756122764d9346039825a4e259d9132f8", + "zh:83139a68790b5307c2b5de18dec77d8833b74ace2cec1b00c40bb707a118481d", + "zh:8b36bcb0a49582a6af8b4eec3ae7f02bc2e65ab9fd022dc9ede5ed64d9bf11cd", + "zh:a0e7b2780309f772c79d2ef303bf2021b49f73c78fa318388e283dc86577be70", + "zh:b86244f33a214e7438f54f314c8dea3554f9318044d313f204e410a03c41d512", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f8dbc327c1a6bb2698da1a4b0c7f0da868c33342f1ff2fb636b74c692f0ed8ed", ] } diff --git a/platform/terraform/gcp/environments/nazgul/main.tf b/platform/terraform/gcp/environments/nazgul/main.tf index 22a2ad1a6..06ada9c0e 100644 --- a/platform/terraform/gcp/environments/nazgul/main.tf +++ b/platform/terraform/gcp/environments/nazgul/main.tf @@ -8,11 +8,11 @@ terraform { } google = { source = "hashicorp/google" - version = "~> 6.0" + version = "~> 8.1" } google-beta = { source = "hashicorp/google-beta" - version = "~> 6.0" + version = "~> 8.1" } random = { source = "hashicorp/random" diff --git a/platform/terraform/gcp/environments/orthanc/.terraform.lock.hcl b/platform/terraform/gcp/environments/orthanc/.terraform.lock.hcl index add4264e1..7c89ad99b 100644 --- a/platform/terraform/gcp/environments/orthanc/.terraform.lock.hcl +++ b/platform/terraform/gcp/environments/orthanc/.terraform.lock.hcl @@ -22,42 +22,42 @@ provider "registry.terraform.io/hashicorp/archive" { } provider "registry.terraform.io/hashicorp/google" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:faTJQOetP9/RYuHwA3r2SWnuYoyzQNm4tUWZrZggcgY=", - "zh:1f3513fcfcbf7ca53d667a168c5067a4dd91a4d4cccd19743e248ff31065503c", - "zh:3da7db8fc2c51a77dd958ea8baaa05c29cd7f829bd8941c26e2ea9cb3aadc1e5", - "zh:3e09ac3f6ca8111cbb659d38c251771829f4347ab159a12db195e211c76068bb", - "zh:7bb9e41c568df15ccf1a8946037355eefb4dfb4e35e3b190808bb7c4abae547d", - "zh:81e5d78bdec7778e6d67b5c3544777505db40a826b6eb5abe9b86d4ba396866b", - "zh:8d309d020fb321525883f5c4ea864df3d5942b6087f6656d6d8b3a1377f340fc", - "zh:93e112559655ab95a523193158f4a4ac0f2bfed7eeaa712010b85ebb551d5071", - "zh:d3efe589ffd625b300cef5917c4629513f77e3a7b111c9df65075f76a46a63c7", - "zh:d4a4d672bbef756a870d8f32b35925f8ce2ef4f6bbd5b71a3cb764f1b6c85421", - "zh:e13a86bca299ba8a118e80d5f84fbdd708fe600ecdceea1a13d4919c068379fe", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fec30c095647b583a246c39d557704947195a1b7d41f81e369ba377d997faef6", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:uxh4ME3hhSzVjmiWgA1IQqYqg25MV6FMVArHyA6Ki5o=", - "zh:18b442bd0a05321d39dda1e9e3f1bdede4e61bc2ac62cc7a67037a3864f75101", - "zh:2e387c51455862828bec923a3ec81abf63a4d998da470cf00e09003bda53d668", - "zh:3942e708fa84ebe54996086f4b1398cb747fe19cbcd0be07ace528291fb35dee", - "zh:496287dd48b34ae6197cb1f887abeafd07c33f389dbe431bb01e24846754cfdd", - "zh:6eca885419969ce5c2a706f34dce1f10bde9774757675f2d8a92d12e5a1be390", - "zh:710dbef826c3fe7f76f844dae47937e8e4c1279dd9205ec4610be04cf3327244", - "zh:777ebf44b24bfc7bdbf770dc089f1a72f143b4718fdedb8c6bd75983115a1ec2", - "zh:9c8703bba37b8c7ad857efc3513392c5a096c519397c1cb822d7612f38e4262f", - "zh:c4f1d3a73de2702277c99d5348ad6d374705bcfdd367ad964ff4cfd2cf06c281", - "zh:eca8df11af3f5a948492d5b8b5d01b4ec705aad10bc30ec1524205508ae28393", - "zh:f41e7fd5f2628e8fd6b8ea136366923858f54428d1729898925469b862c275c2", + "h1:XkjlBJkEMNY+bcst7vAaPVdLbS7Xpv2nykUIvUnEf44=", + "zh:00777505d2bc229092a1ce7aee182cadac994e386aee89f480231e886e8a9ffb", + "zh:097d0f3a8af2779a1f061f6a73004dac096a2117ca03900900ab8ca09add4d59", + "zh:4fe838367f02b50afa24a6aac3f3e217684cea82f2ac74e44c9f98858113e1e9", + "zh:697708c36cf8d855deb751e944ec53e9c0da362fdeb11f9290834c5008f04caf", + "zh:706939b2bc86a03c7b53115088873bf1d361c2fe150b7190351ae2241d6ef3f2", + "zh:7e761e31836a9d2e20c550236955859756122764d9346039825a4e259d9132f8", + "zh:83139a68790b5307c2b5de18dec77d8833b74ace2cec1b00c40bb707a118481d", + "zh:8b36bcb0a49582a6af8b4eec3ae7f02bc2e65ab9fd022dc9ede5ed64d9bf11cd", + "zh:a0e7b2780309f772c79d2ef303bf2021b49f73c78fa318388e283dc86577be70", + "zh:b86244f33a214e7438f54f314c8dea3554f9318044d313f204e410a03c41d512", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f8dbc327c1a6bb2698da1a4b0c7f0da868c33342f1ff2fb636b74c692f0ed8ed", ] } diff --git a/platform/terraform/gcp/environments/orthanc/main.tf b/platform/terraform/gcp/environments/orthanc/main.tf index 22a2ad1a6..06ada9c0e 100644 --- a/platform/terraform/gcp/environments/orthanc/main.tf +++ b/platform/terraform/gcp/environments/orthanc/main.tf @@ -8,11 +8,11 @@ terraform { } google = { source = "hashicorp/google" - version = "~> 6.0" + version = "~> 8.1" } google-beta = { source = "hashicorp/google-beta" - version = "~> 6.0" + version = "~> 8.1" } random = { source = "hashicorp/random" diff --git a/platform/terraform/gcp/environments/sauron/.terraform.lock.hcl b/platform/terraform/gcp/environments/sauron/.terraform.lock.hcl index add4264e1..7c89ad99b 100644 --- a/platform/terraform/gcp/environments/sauron/.terraform.lock.hcl +++ b/platform/terraform/gcp/environments/sauron/.terraform.lock.hcl @@ -22,42 +22,42 @@ provider "registry.terraform.io/hashicorp/archive" { } provider "registry.terraform.io/hashicorp/google" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:faTJQOetP9/RYuHwA3r2SWnuYoyzQNm4tUWZrZggcgY=", - "zh:1f3513fcfcbf7ca53d667a168c5067a4dd91a4d4cccd19743e248ff31065503c", - "zh:3da7db8fc2c51a77dd958ea8baaa05c29cd7f829bd8941c26e2ea9cb3aadc1e5", - "zh:3e09ac3f6ca8111cbb659d38c251771829f4347ab159a12db195e211c76068bb", - "zh:7bb9e41c568df15ccf1a8946037355eefb4dfb4e35e3b190808bb7c4abae547d", - "zh:81e5d78bdec7778e6d67b5c3544777505db40a826b6eb5abe9b86d4ba396866b", - "zh:8d309d020fb321525883f5c4ea864df3d5942b6087f6656d6d8b3a1377f340fc", - "zh:93e112559655ab95a523193158f4a4ac0f2bfed7eeaa712010b85ebb551d5071", - "zh:d3efe589ffd625b300cef5917c4629513f77e3a7b111c9df65075f76a46a63c7", - "zh:d4a4d672bbef756a870d8f32b35925f8ce2ef4f6bbd5b71a3cb764f1b6c85421", - "zh:e13a86bca299ba8a118e80d5f84fbdd708fe600ecdceea1a13d4919c068379fe", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fec30c095647b583a246c39d557704947195a1b7d41f81e369ba377d997faef6", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:uxh4ME3hhSzVjmiWgA1IQqYqg25MV6FMVArHyA6Ki5o=", - "zh:18b442bd0a05321d39dda1e9e3f1bdede4e61bc2ac62cc7a67037a3864f75101", - "zh:2e387c51455862828bec923a3ec81abf63a4d998da470cf00e09003bda53d668", - "zh:3942e708fa84ebe54996086f4b1398cb747fe19cbcd0be07ace528291fb35dee", - "zh:496287dd48b34ae6197cb1f887abeafd07c33f389dbe431bb01e24846754cfdd", - "zh:6eca885419969ce5c2a706f34dce1f10bde9774757675f2d8a92d12e5a1be390", - "zh:710dbef826c3fe7f76f844dae47937e8e4c1279dd9205ec4610be04cf3327244", - "zh:777ebf44b24bfc7bdbf770dc089f1a72f143b4718fdedb8c6bd75983115a1ec2", - "zh:9c8703bba37b8c7ad857efc3513392c5a096c519397c1cb822d7612f38e4262f", - "zh:c4f1d3a73de2702277c99d5348ad6d374705bcfdd367ad964ff4cfd2cf06c281", - "zh:eca8df11af3f5a948492d5b8b5d01b4ec705aad10bc30ec1524205508ae28393", - "zh:f41e7fd5f2628e8fd6b8ea136366923858f54428d1729898925469b862c275c2", + "h1:XkjlBJkEMNY+bcst7vAaPVdLbS7Xpv2nykUIvUnEf44=", + "zh:00777505d2bc229092a1ce7aee182cadac994e386aee89f480231e886e8a9ffb", + "zh:097d0f3a8af2779a1f061f6a73004dac096a2117ca03900900ab8ca09add4d59", + "zh:4fe838367f02b50afa24a6aac3f3e217684cea82f2ac74e44c9f98858113e1e9", + "zh:697708c36cf8d855deb751e944ec53e9c0da362fdeb11f9290834c5008f04caf", + "zh:706939b2bc86a03c7b53115088873bf1d361c2fe150b7190351ae2241d6ef3f2", + "zh:7e761e31836a9d2e20c550236955859756122764d9346039825a4e259d9132f8", + "zh:83139a68790b5307c2b5de18dec77d8833b74ace2cec1b00c40bb707a118481d", + "zh:8b36bcb0a49582a6af8b4eec3ae7f02bc2e65ab9fd022dc9ede5ed64d9bf11cd", + "zh:a0e7b2780309f772c79d2ef303bf2021b49f73c78fa318388e283dc86577be70", + "zh:b86244f33a214e7438f54f314c8dea3554f9318044d313f204e410a03c41d512", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f8dbc327c1a6bb2698da1a4b0c7f0da868c33342f1ff2fb636b74c692f0ed8ed", ] } diff --git a/platform/terraform/gcp/environments/sauron/main.tf b/platform/terraform/gcp/environments/sauron/main.tf index 22a2ad1a6..06ada9c0e 100644 --- a/platform/terraform/gcp/environments/sauron/main.tf +++ b/platform/terraform/gcp/environments/sauron/main.tf @@ -8,11 +8,11 @@ terraform { } google = { source = "hashicorp/google" - version = "~> 6.0" + version = "~> 8.1" } google-beta = { source = "hashicorp/google-beta" - version = "~> 6.0" + version = "~> 8.1" } random = { source = "hashicorp/random" diff --git a/platform/terraform/gcp/global/cicd-oidc/.terraform.lock.hcl b/platform/terraform/gcp/global/cicd-oidc/.terraform.lock.hcl index 0a1f03d6c..d9f5eb774 100644 --- a/platform/terraform/gcp/global/cicd-oidc/.terraform.lock.hcl +++ b/platform/terraform/gcp/global/cicd-oidc/.terraform.lock.hcl @@ -2,21 +2,21 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:faTJQOetP9/RYuHwA3r2SWnuYoyzQNm4tUWZrZggcgY=", - "zh:1f3513fcfcbf7ca53d667a168c5067a4dd91a4d4cccd19743e248ff31065503c", - "zh:3da7db8fc2c51a77dd958ea8baaa05c29cd7f829bd8941c26e2ea9cb3aadc1e5", - "zh:3e09ac3f6ca8111cbb659d38c251771829f4347ab159a12db195e211c76068bb", - "zh:7bb9e41c568df15ccf1a8946037355eefb4dfb4e35e3b190808bb7c4abae547d", - "zh:81e5d78bdec7778e6d67b5c3544777505db40a826b6eb5abe9b86d4ba396866b", - "zh:8d309d020fb321525883f5c4ea864df3d5942b6087f6656d6d8b3a1377f340fc", - "zh:93e112559655ab95a523193158f4a4ac0f2bfed7eeaa712010b85ebb551d5071", - "zh:d3efe589ffd625b300cef5917c4629513f77e3a7b111c9df65075f76a46a63c7", - "zh:d4a4d672bbef756a870d8f32b35925f8ce2ef4f6bbd5b71a3cb764f1b6c85421", - "zh:e13a86bca299ba8a118e80d5f84fbdd708fe600ecdceea1a13d4919c068379fe", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fec30c095647b583a246c39d557704947195a1b7d41f81e369ba377d997faef6", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/global/cicd-oidc/main.tf b/platform/terraform/gcp/global/cicd-oidc/main.tf index d70dec4ec..ca75ed78b 100644 --- a/platform/terraform/gcp/global/cicd-oidc/main.tf +++ b/platform/terraform/gcp/global/cicd-oidc/main.tf @@ -22,7 +22,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 6.0" + version = "~> 8.1" } } } diff --git a/platform/terraform/gcp/global/github-runner/.terraform.lock.hcl b/platform/terraform/gcp/global/github-runner/.terraform.lock.hcl index 0a1f03d6c..d9f5eb774 100644 --- a/platform/terraform/gcp/global/github-runner/.terraform.lock.hcl +++ b/platform/terraform/gcp/global/github-runner/.terraform.lock.hcl @@ -2,21 +2,21 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:faTJQOetP9/RYuHwA3r2SWnuYoyzQNm4tUWZrZggcgY=", - "zh:1f3513fcfcbf7ca53d667a168c5067a4dd91a4d4cccd19743e248ff31065503c", - "zh:3da7db8fc2c51a77dd958ea8baaa05c29cd7f829bd8941c26e2ea9cb3aadc1e5", - "zh:3e09ac3f6ca8111cbb659d38c251771829f4347ab159a12db195e211c76068bb", - "zh:7bb9e41c568df15ccf1a8946037355eefb4dfb4e35e3b190808bb7c4abae547d", - "zh:81e5d78bdec7778e6d67b5c3544777505db40a826b6eb5abe9b86d4ba396866b", - "zh:8d309d020fb321525883f5c4ea864df3d5942b6087f6656d6d8b3a1377f340fc", - "zh:93e112559655ab95a523193158f4a4ac0f2bfed7eeaa712010b85ebb551d5071", - "zh:d3efe589ffd625b300cef5917c4629513f77e3a7b111c9df65075f76a46a63c7", - "zh:d4a4d672bbef756a870d8f32b35925f8ce2ef4f6bbd5b71a3cb764f1b6c85421", - "zh:e13a86bca299ba8a118e80d5f84fbdd708fe600ecdceea1a13d4919c068379fe", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fec30c095647b583a246c39d557704947195a1b7d41f81e369ba377d997faef6", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/global/github-runner/main.tf b/platform/terraform/gcp/global/github-runner/main.tf index dff1bef4c..fc217bd9a 100644 --- a/platform/terraform/gcp/global/github-runner/main.tf +++ b/platform/terraform/gcp/global/github-runner/main.tf @@ -22,7 +22,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 6.0" + version = "~> 8.1" } } } diff --git a/platform/terraform/gcp/modules/cicd-oidc-identity/.terraform.lock.hcl b/platform/terraform/gcp/modules/cicd-oidc-identity/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/cicd-oidc-identity/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/cicd-oidc-identity/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/cicd-oidc-identity/main.tf b/platform/terraform/gcp/modules/cicd-oidc-identity/main.tf index a143518a0..d86534f2b 100644 --- a/platform/terraform/gcp/modules/cicd-oidc-identity/main.tf +++ b/platform/terraform/gcp/modules/cicd-oidc-identity/main.tf @@ -356,7 +356,7 @@ resource "google_storage_bucket" "release_evidence" { } retention_policy { - retention_period = 7776000 + retention_period = "7776000" is_locked = true } diff --git a/platform/terraform/gcp/modules/github-runner-network/.terraform.lock.hcl b/platform/terraform/gcp/modules/github-runner-network/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/github-runner-network/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/github-runner-network/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/packer-build-infra/.terraform.lock.hcl b/platform/terraform/gcp/modules/packer-build-infra/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/packer-build-infra/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/packer-build-infra/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/platform-core/.terraform.lock.hcl b/platform/terraform/gcp/modules/platform-core/.terraform.lock.hcl index 3b55f1604..e305f254b 100644 --- a/platform/terraform/gcp/modules/platform-core/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/platform-core/.terraform.lock.hcl @@ -22,21 +22,42 @@ provider "registry.terraform.io/hashicorp/archive" { } provider "registry.terraform.io/hashicorp/google" { - version = "7.38.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:LitNKo0h3wOV/Q0ondnOpoXf59cEFLS4qp/cqphUzww=", - "zh:252b32e4880470c75ae9b8524ea3bf7fe76f6ca2e575a72c421cfa0526febda1", - "zh:2e70472ca364dc6700d604d251fd357c80967e0ae4469464035e9fe58f1347b8", - "zh:40369d248428eab99a2cf88d8215c21cf0dc40a50d0892819b6bd5df6a45626d", - "zh:5ef283ef49b80d671b5c80a3e081378b59494287afc17a2818173146ccf7ddcd", - "zh:65a1c80e03aa3d33d2b1c56e8448cf666e10914cf2b7cc8f95791f4e50b03f7c", - "zh:6a4771b54605df6473d2dc0e3885ae0c3be2a62a8bef04c41115d5a273f40a4b", - "zh:73246bb2a4d6ff9d50de249c62e2dde6024c82e768b7c50c7fe144f032fb000f", - "zh:8e1a27e3c4a616f5307ca33f2b9217e159831baf9adca9fdf936ea973fdb8935", - "zh:9fba018be62caf7c0a8922f630b6d9fbfa67c8dda2fafe15947627e3d385f5c3", - "zh:c2acc26b079c83351e4ebda0989ffe4d6a8a5264551a09f51ceb4a8a5d517b0b", - "zh:c5183cd673ddbcaba59290b77bbf00f7d01d78a73621bb614ef274915c791192", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", + ] +} + +provider "registry.terraform.io/hashicorp/google-beta" { + version = "8.4.0" + constraints = "~> 8.1" + hashes = [ + "h1:XkjlBJkEMNY+bcst7vAaPVdLbS7Xpv2nykUIvUnEf44=", + "zh:00777505d2bc229092a1ce7aee182cadac994e386aee89f480231e886e8a9ffb", + "zh:097d0f3a8af2779a1f061f6a73004dac096a2117ca03900900ab8ca09add4d59", + "zh:4fe838367f02b50afa24a6aac3f3e217684cea82f2ac74e44c9f98858113e1e9", + "zh:697708c36cf8d855deb751e944ec53e9c0da362fdeb11f9290834c5008f04caf", + "zh:706939b2bc86a03c7b53115088873bf1d361c2fe150b7190351ae2241d6ef3f2", + "zh:7e761e31836a9d2e20c550236955859756122764d9346039825a4e259d9132f8", + "zh:83139a68790b5307c2b5de18dec77d8833b74ace2cec1b00c40bb707a118481d", + "zh:8b36bcb0a49582a6af8b4eec3ae7f02bc2e65ab9fd022dc9ede5ed64d9bf11cd", + "zh:a0e7b2780309f772c79d2ef303bf2021b49f73c78fa318388e283dc86577be70", + "zh:b86244f33a214e7438f54f314c8dea3554f9318044d313f204e410a03c41d512", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f8dbc327c1a6bb2698da1a4b0c7f0da868c33342f1ff2fb636b74c692f0ed8ed", ] } diff --git a/platform/terraform/gcp/modules/portal/artifact-registry/.terraform.lock.hcl b/platform/terraform/gcp/modules/portal/artifact-registry/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/portal/artifact-registry/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/portal/artifact-registry/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/portal/cloud-sql/.terraform.lock.hcl b/platform/terraform/gcp/modules/portal/cloud-sql/.terraform.lock.hcl index e6660cdf0..37b2f5d65 100644 --- a/platform/terraform/gcp/modules/portal/cloud-sql/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/portal/cloud-sql/.terraform.lock.hcl @@ -2,21 +2,21 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/portal/gcs/.terraform.lock.hcl b/platform/terraform/gcp/modules/portal/gcs/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/portal/gcs/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/portal/gcs/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/portal/gke/.terraform.lock.hcl b/platform/terraform/gcp/modules/portal/gke/.terraform.lock.hcl index e2e0fffe5..69771b585 100644 --- a/platform/terraform/gcp/modules/portal/gke/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/portal/gke/.terraform.lock.hcl @@ -2,41 +2,41 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:faTJQOetP9/RYuHwA3r2SWnuYoyzQNm4tUWZrZggcgY=", - "zh:1f3513fcfcbf7ca53d667a168c5067a4dd91a4d4cccd19743e248ff31065503c", - "zh:3da7db8fc2c51a77dd958ea8baaa05c29cd7f829bd8941c26e2ea9cb3aadc1e5", - "zh:3e09ac3f6ca8111cbb659d38c251771829f4347ab159a12db195e211c76068bb", - "zh:7bb9e41c568df15ccf1a8946037355eefb4dfb4e35e3b190808bb7c4abae547d", - "zh:81e5d78bdec7778e6d67b5c3544777505db40a826b6eb5abe9b86d4ba396866b", - "zh:8d309d020fb321525883f5c4ea864df3d5942b6087f6656d6d8b3a1377f340fc", - "zh:93e112559655ab95a523193158f4a4ac0f2bfed7eeaa712010b85ebb551d5071", - "zh:d3efe589ffd625b300cef5917c4629513f77e3a7b111c9df65075f76a46a63c7", - "zh:d4a4d672bbef756a870d8f32b35925f8ce2ef4f6bbd5b71a3cb764f1b6c85421", - "zh:e13a86bca299ba8a118e80d5f84fbdd708fe600ecdceea1a13d4919c068379fe", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fec30c095647b583a246c39d557704947195a1b7d41f81e369ba377d997faef6", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "6.50.0" - constraints = "~> 6.0" + version = "8.4.0" + constraints = "~> 8.1" hashes = [ - "h1:uxh4ME3hhSzVjmiWgA1IQqYqg25MV6FMVArHyA6Ki5o=", - "zh:18b442bd0a05321d39dda1e9e3f1bdede4e61bc2ac62cc7a67037a3864f75101", - "zh:2e387c51455862828bec923a3ec81abf63a4d998da470cf00e09003bda53d668", - "zh:3942e708fa84ebe54996086f4b1398cb747fe19cbcd0be07ace528291fb35dee", - "zh:496287dd48b34ae6197cb1f887abeafd07c33f389dbe431bb01e24846754cfdd", - "zh:6eca885419969ce5c2a706f34dce1f10bde9774757675f2d8a92d12e5a1be390", - "zh:710dbef826c3fe7f76f844dae47937e8e4c1279dd9205ec4610be04cf3327244", - "zh:777ebf44b24bfc7bdbf770dc089f1a72f143b4718fdedb8c6bd75983115a1ec2", - "zh:9c8703bba37b8c7ad857efc3513392c5a096c519397c1cb822d7612f38e4262f", - "zh:c4f1d3a73de2702277c99d5348ad6d374705bcfdd367ad964ff4cfd2cf06c281", - "zh:eca8df11af3f5a948492d5b8b5d01b4ec705aad10bc30ec1524205508ae28393", - "zh:f41e7fd5f2628e8fd6b8ea136366923858f54428d1729898925469b862c275c2", + "h1:XkjlBJkEMNY+bcst7vAaPVdLbS7Xpv2nykUIvUnEf44=", + "zh:00777505d2bc229092a1ce7aee182cadac994e386aee89f480231e886e8a9ffb", + "zh:097d0f3a8af2779a1f061f6a73004dac096a2117ca03900900ab8ca09add4d59", + "zh:4fe838367f02b50afa24a6aac3f3e217684cea82f2ac74e44c9f98858113e1e9", + "zh:697708c36cf8d855deb751e944ec53e9c0da362fdeb11f9290834c5008f04caf", + "zh:706939b2bc86a03c7b53115088873bf1d361c2fe150b7190351ae2241d6ef3f2", + "zh:7e761e31836a9d2e20c550236955859756122764d9346039825a4e259d9132f8", + "zh:83139a68790b5307c2b5de18dec77d8833b74ace2cec1b00c40bb707a118481d", + "zh:8b36bcb0a49582a6af8b4eec3ae7f02bc2e65ab9fd022dc9ede5ed64d9bf11cd", + "zh:a0e7b2780309f772c79d2ef303bf2021b49f73c78fa318388e283dc86577be70", + "zh:b86244f33a214e7438f54f314c8dea3554f9318044d313f204e410a03c41d512", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f8dbc327c1a6bb2698da1a4b0c7f0da868c33342f1ff2fb636b74c692f0ed8ed", ] } diff --git a/platform/terraform/gcp/modules/portal/gke/providers.tf b/platform/terraform/gcp/modules/portal/gke/providers.tf index 975346ccf..053061f08 100644 --- a/platform/terraform/gcp/modules/portal/gke/providers.tf +++ b/platform/terraform/gcp/modules/portal/gke/providers.tf @@ -3,11 +3,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 6.0" + version = "~> 8.1" } google-beta = { source = "hashicorp/google-beta" - version = "~> 6.0" + version = "~> 8.1" } } } diff --git a/platform/terraform/gcp/modules/portal/gke/runtime-plugins.tf b/platform/terraform/gcp/modules/portal/gke/runtime-plugins.tf index 0717668cb..83fe444b4 100644 --- a/platform/terraform/gcp/modules/portal/gke/runtime-plugins.tf +++ b/platform/terraform/gcp/modules/portal/gke/runtime-plugins.tf @@ -33,7 +33,7 @@ resource "google_container_node_pool" "runtime_plugins" { tags = ["shifter", "gke", "runtime-plugin"] sandbox_config { - sandbox_type = "gvisor" + type = "GVISOR" } taint { diff --git a/platform/terraform/gcp/modules/portal/gke/tests/main.tftest.hcl b/platform/terraform/gcp/modules/portal/gke/tests/main.tftest.hcl index 5990c4ec5..35c04e0be 100644 --- a/platform/terraform/gcp/modules/portal/gke/tests/main.tftest.hcl +++ b/platform/terraform/gcp/modules/portal/gke/tests/main.tftest.hcl @@ -59,7 +59,7 @@ run "untrusted_plugin_sandbox_pool" { assert { condition = ( - google_container_node_pool.runtime_plugins.node_config[0].sandbox_config[0].sandbox_type == "gvisor" && + google_container_node_pool.runtime_plugins.node_config[0].sandbox_config[0].type == "GVISOR" && google_container_node_pool.runtime_plugins.node_config[0].image_type == "COS_CONTAINERD" && google_container_node_pool.runtime_plugins.node_config[0].labels["node-restriction.kubernetes.io/shifter-pool"] == "runtime-plugin" && anytrue([for taint in google_container_node_pool.runtime_plugins.node_config[0].taint : diff --git a/platform/terraform/gcp/modules/portal/iam/.terraform.lock.hcl b/platform/terraform/gcp/modules/portal/iam/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/portal/iam/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/portal/iam/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/portal/identity-platform/.terraform.lock.hcl b/platform/terraform/gcp/modules/portal/identity-platform/.terraform.lock.hcl index 3a3727a33..cd3bd7f82 100644 --- a/platform/terraform/gcp/modules/portal/identity-platform/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/portal/identity-platform/.terraform.lock.hcl @@ -22,20 +22,20 @@ provider "registry.terraform.io/hashicorp/archive" { } provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/portal/ingress/.terraform.lock.hcl b/platform/terraform/gcp/modules/portal/ingress/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/portal/ingress/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/portal/ingress/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/portal/messaging/.terraform.lock.hcl b/platform/terraform/gcp/modules/portal/messaging/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/portal/messaging/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/portal/messaging/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/portal/redis/.terraform.lock.hcl b/platform/terraform/gcp/modules/portal/redis/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/portal/redis/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/portal/redis/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/portal/secrets/.terraform.lock.hcl b/platform/terraform/gcp/modules/portal/secrets/.terraform.lock.hcl index e6660cdf0..37b2f5d65 100644 --- a/platform/terraform/gcp/modules/portal/secrets/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/portal/secrets/.terraform.lock.hcl @@ -2,21 +2,21 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/portal/vpc/.terraform.lock.hcl b/platform/terraform/gcp/modules/portal/vpc/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/portal/vpc/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/portal/vpc/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/portal/vpc/main.tf b/platform/terraform/gcp/modules/portal/vpc/main.tf index 524dabfa5..e1ba27df3 100644 --- a/platform/terraform/gcp/modules/portal/vpc/main.tf +++ b/platform/terraform/gcp/modules/portal/vpc/main.tf @@ -149,6 +149,13 @@ resource "google_service_networking_connection" "services" { network = google_compute_network.platform.id service = "servicenetworking.googleapis.com" reserved_peering_ranges = [google_compute_global_address.services.name] + + # The default delete call is refused while the service producer still holds + # the peering, even after Cloud SQL and Memorystore are gone. REMOVE_PEERING + # deletes the VPC peering itself so the platform network can then be deleted. + # Safe only because destroy ordering removes every producer (Cloud SQL, + # Memorystore) that depends on this connection before it is deleted. + deletion_policy = "REMOVE_PEERING" } # Private Google Access DNS for the platform network. The access node pool is diff --git a/platform/terraform/gcp/modules/portal/vpc/tests/main.tftest.hcl b/platform/terraform/gcp/modules/portal/vpc/tests/main.tftest.hcl new file mode 100644 index 000000000..e75d05076 --- /dev/null +++ b/platform/terraform/gcp/modules/portal/vpc/tests/main.tftest.hcl @@ -0,0 +1,41 @@ +# Portal VPC private-services-access teardown contract test. +# +# Proves the Service Networking connection uses deletion_policy REMOVE_PEERING. +# Without it, `terraform destroy` fails on the connection with "Producer +# services (e.g. CloudSQL, Cloud Memstore, etc.) are still using this +# connection" even after Cloud SQL and Memorystore are deleted, and the +# platform network cannot be removed. ABANDON is not an acceptable substitute: +# it leaves the peering in place, which still blocks deleting the network. +# +# Credential-free: mock_provider synthesizes the google provider; `command = +# plan` is sufficient because deletion_policy is a configuration-known value. +# Run with: +# terraform -chdir=platform/terraform/gcp/modules/portal/vpc test + +mock_provider "google" {} + +variables { + project_id = "shifter-test" + region = "us-central1" + name_prefix = "shifter-test" + gke_subnet_cidr = "10.0.0.0/20" + gke_pods_cidr = "10.4.0.0/14" + gke_services_cidr = "10.8.0.0/20" + gke_provisioner_pods_cidr = "10.40.0.0/20" + gke_pods_secondary_range_name = "pods" + gke_services_secondary_range_name = "services" + gke_provisioner_pods_secondary_range_name = "provisioner-pods" + gke_access_pods_cidr = "10.48.0.0/20" + gke_access_pods_secondary_range_name = "access-pods" + private_service_range_prefix_length = 16 + operator_admin_cidrs = [] +} + +run "service_networking_connection_removes_peering_on_destroy" { + command = plan + + assert { + condition = google_service_networking_connection.services.deletion_policy == "REMOVE_PEERING" + error_message = "The private-services-access connection must use deletion_policy REMOVE_PEERING so destroy releases the producer-held peering and the platform network can be deleted." + } +} diff --git a/platform/terraform/gcp/modules/project-services/.terraform.lock.hcl b/platform/terraform/gcp/modules/project-services/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/project-services/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/project-services/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/raes-package-storage/.terraform.lock.hcl b/platform/terraform/gcp/modules/raes-package-storage/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/raes-package-storage/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/raes-package-storage/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/gcp/modules/range/vpc/.terraform.lock.hcl b/platform/terraform/gcp/modules/range/vpc/.terraform.lock.hcl index 3888353b8..f52d437b3 100644 --- a/platform/terraform/gcp/modules/range/vpc/.terraform.lock.hcl +++ b/platform/terraform/gcp/modules/range/vpc/.terraform.lock.hcl @@ -2,20 +2,20 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "8.2.0" + version = "8.4.0" hashes = [ - "h1:Y6nbie6TYtIO7IBucSdIh01BVIloBNgsfUulhaRj2Q4=", - "zh:33d5af72bbd029230ce646afe0758bce51def93eeca10c84888cbc6d1528d196", - "zh:389f386f3127ba71d1b4dfd421dea33d370e15d0d5ae72aaa59aff680d1e389c", - "zh:6267367e2f7316be0599720e232cc4299d591389576857cb399d69e05bc31c5a", - "zh:682c5a03828e2b28ae1f7749bcee662b00fb4bf70f630a7c5a7e99c464fb70f9", - "zh:746bafbd3ec77c44acc07eb5b2926c019e5b4b75ad12d85eae1fb045323e8564", - "zh:8347ff1cbb406c112099a7d586a6b0d7270d548721de13abfc796039687bdbf2", - "zh:c5e0e6014dbcd99df763bd71d6b8c5e50251c25643e2f381610e6fc4c48e28b1", - "zh:c7909c30cad99f08d5fc5c0eb8fbfb2d59a6c755aa208d831c68dac483b653e4", - "zh:d578c86354d0abf6a1be0788639b1cd491363d8ca43b2db9d40b64c0503ac9db", - "zh:d6c106186f21ab8016a7876e17a0b2fa4ac89406439ed582f84e50035c5aa805", - "zh:f1e6883783fa8cb5817a0b60b7dee29cd30979c804cd6dfff626aaab143a5ea5", + "h1:wrTEDMONJgXiuysbdlnTKr9LbD7uL8Q8eMA0lwX+mVE=", + "zh:0a5eb94e558ae40cc0d992ce1c9bd717decda1a109fd743c5e0872be858f2c79", + "zh:1b0c6708fadba06883f56e5de2b7c199450642a1d1af932d09a95983935f10bf", + "zh:28bd7dbce76d2925a3257c4095fd120404e35f4722f48aef771a3cba281d748b", + "zh:623f853b5f3d3883dd40bd6f9bb75680f89ffa83591d8089f61462d25e98a011", + "zh:8299aac08c13c611107a7c8d8faaed5a8f0abfb802e40bea401c147bcf0bf87c", + "zh:8ba4e7b9e103a93a9d8fcf0d059cf5dabacba14497792b470ead517b72723360", + "zh:92478110a52b2ba78d5e3f190f40bb94c9d87ec1bda28419bb42124dc6afbae1", + "zh:9e0ba6564ef6c0ae46d60a73aaf9cb9e81c80d141fd7a1503fe15850adc5d96a", + "zh:bf300965bb76e1681a4688d0113d502d833217c1c8dd81f428229b54234b73a9", + "zh:c6a05a8577a8f7da78cba98d665fcc925aa9e20c8614d31e7d64a7573ceeee15", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f7f724b63400239face928c8205708eaa46e78ee8c1684912e3067e82a6e3556", ] } diff --git a/platform/terraform/validation-inventory.yaml b/platform/terraform/validation-inventory.yaml index 3fb1766b0..4dacf95cf 100644 --- a/platform/terraform/validation-inventory.yaml +++ b/platform/terraform/validation-inventory.yaml @@ -457,6 +457,6 @@ modules: tracking: "#1597" - path: platform/terraform/gcp/modules/portal/vpc owner: "@Brad-Edwards" - contract: deferred - reason: "Contract-test rollout tracked in #1597." - tracking: "#1597" + contract: terraform_test + test: tests/main.tftest.hcl + test_profile: gcp-1.16.1 diff --git a/scripts/adr_guard/tests/test_deploy_workflow.py b/scripts/adr_guard/tests/test_deploy_workflow.py index 8545ead15..5771a2570 100644 --- a/scripts/adr_guard/tests/test_deploy_workflow.py +++ b/scripts/adr_guard/tests/test_deploy_workflow.py @@ -673,7 +673,7 @@ def test_raw_release_evidence_is_not_uploaded_as_an_actions_artifact(self): self.assert_hcl_assignment(identity, "role", '"roles/storage.objectViewer"') self.assert_hcl_assignment(identity, 'public_access_prevention', '"enforced"') self.assert_hcl_assignment(identity, 'uniform_bucket_level_access', 'true') - self.assert_hcl_assignment(identity, 'retention_period', '7776000') + self.assert_hcl_assignment(identity, 'retention_period', '"7776000"') self.assert_hcl_assignment(identity, 'is_locked', 'true') def test_gcp_guest_build_and_sbom_evidence_cross_trust_boundaries(self): diff --git a/shifter/shifter_platform/shared/cloud/preparation_cloud_installation.py b/shifter/shifter_platform/shared/cloud/preparation_cloud_installation.py index d76dd0035..88865848d 100644 --- a/shifter/shifter_platform/shared/cloud/preparation_cloud_installation.py +++ b/shifter/shifter_platform/shared/cloud/preparation_cloud_installation.py @@ -190,7 +190,7 @@ def render_preparation_terraform(configuration: PreparationInstallation) -> dict "terraform": { "required_version": ">= 1.7, < 2.0", "backend": {"gcs": {}}, - "required_providers": {"google": {"source": "hashicorp/google", "version": "~> 6.0"}}, + "required_providers": {"google": {"source": "hashicorp/google", "version": "~> 8.1"}}, }, "provider": {"google": {"project": grant.project_id, "region": region}}, "resource": resources,