From c6a716ef1865e9d9091efcc38d33eda122612757 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Thu, 5 Sep 2024 10:56:35 -0700 Subject: [PATCH 1/6] chore(CI): Update renovate.json (#2573) --- .github/renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index f31b9f1656c..d6e62ef8cb0 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -23,7 +23,8 @@ "extends": [":semanticCommitTypeAll(chore)", ":rebaseStalePrs"] }, { - "matchPackageNames": ["google", "google-beta"], + "matchManagers": ["terraform"], + "matchDepNames": ["google", "google-beta"], "groupName": "terraform google provider", "rangeStrategy": "widen" }, From 7190012022376acc5f726c5b6d82fef07edaa83c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Sep 2024 20:27:23 +0200 Subject: [PATCH 2/6] chore(deps): update actions/upload-artifact action to v4.4.0 (#2576) --- .github/workflows/release-cli.yml | 2 +- .github/workflows/scorecard.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index bb24d4d159d..e54d7e3aa32 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -55,7 +55,7 @@ jobs: chmod +x bin/* - name: Archive build artifacts - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 with: name: bin path: cli/bin diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index e284e034411..0622fdedc43 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -59,7 +59,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 with: name: SARIF file path: results.sarif From e288615361472de1940ca092388439864749cba1 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Sep 2024 21:12:17 +0200 Subject: [PATCH 3/6] fix(deps): update module golang.org/x/mod to v0.21.0 (#2574) Co-authored-by: Andrew Peabody --- infra/blueprint-test/go.mod | 4 ++-- infra/blueprint-test/go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infra/blueprint-test/go.mod b/infra/blueprint-test/go.mod index f74f741ec58..eba4766cd04 100644 --- a/infra/blueprint-test/go.mod +++ b/infra/blueprint-test/go.mod @@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-t go 1.22 -toolchain go1.22.6 +toolchain go1.22.7 require ( github.com/GoogleContainerTools/kpt-functions-sdk/go/api v0.0.0-20230427202446-3255accc518d @@ -15,7 +15,7 @@ require ( github.com/stretchr/testify v1.9.0 github.com/tidwall/gjson v1.17.3 github.com/tidwall/sjson v1.2.5 - golang.org/x/mod v0.20.0 + golang.org/x/mod v0.21.0 sigs.k8s.io/kustomize/kyaml v0.17.2 ) diff --git a/infra/blueprint-test/go.sum b/infra/blueprint-test/go.sum index fbcb2a61d6e..48c75bfabe5 100644 --- a/infra/blueprint-test/go.sum +++ b/infra/blueprint-test/go.sum @@ -581,8 +581,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= From 490d63bf25395f71ad571cb7ade136663cafebef Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Sep 2024 21:56:58 +0200 Subject: [PATCH 4/6] fix(deps): update module github.com/gruntwork-io/terratest to v0.47.1 (#2578) Co-authored-by: Andrew Peabody --- infra/blueprint-test/go.mod | 4 ++-- infra/blueprint-test/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/infra/blueprint-test/go.mod b/infra/blueprint-test/go.mod index eba4766cd04..e56a45a1ce5 100644 --- a/infra/blueprint-test/go.mod +++ b/infra/blueprint-test/go.mod @@ -7,7 +7,7 @@ toolchain go1.22.7 require ( github.com/GoogleContainerTools/kpt-functions-sdk/go/api v0.0.0-20230427202446-3255accc518d github.com/alexflint/go-filemutex v1.3.0 - github.com/gruntwork-io/terratest v0.47.0 + github.com/gruntwork-io/terratest v0.47.1 github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 github.com/hashicorp/terraform-json v0.22.1 github.com/mitchellh/go-testing-interface v1.14.2-0.20210821155943-2d9075ca8770 @@ -52,7 +52,7 @@ require ( github.com/gruntwork-io/go-commons v0.17.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-getter v1.7.5 // indirect + github.com/hashicorp/go-getter v1.7.6 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect diff --git a/infra/blueprint-test/go.sum b/infra/blueprint-test/go.sum index 48c75bfabe5..7537b06bf27 100644 --- a/infra/blueprint-test/go.sum +++ b/infra/blueprint-test/go.sum @@ -378,15 +378,15 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0= github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk= -github.com/gruntwork-io/terratest v0.47.0 h1:xIy1pT7NbGVlMLDZEHl3+3iSnvffh8tN2pL6idn448c= -github.com/gruntwork-io/terratest v0.47.0/go.mod h1:oywHw1cFKXSYvKPm27U7quZVzDUlA22H2xUrKCe26xM= +github.com/gruntwork-io/terratest v0.47.1 h1:qOaxnL7Su5+KpDHYUN/ek1jn8ImvCKtOkaY4OSMS4tI= +github.com/gruntwork-io/terratest v0.47.1/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-getter v1.7.5 h1:dT58k9hQ/vbxNMwoI5+xFYAJuv6152UNvdHokfI5wE4= -github.com/hashicorp/go-getter v1.7.5/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-getter v1.7.6 h1:5jHuM+aH373XNtXl9TNTUH5Qd69Trve11tHIrB+6yj4= +github.com/hashicorp/go-getter v1.7.6/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= From 9d273e6938ca089b24480d4b4cb984d3f3feaee0 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 14:30:08 -0700 Subject: [PATCH 5/6] chore(release-please): release blueprint-test 0.16.2 (#2475) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- infra/blueprint-test/CHANGELOG.md | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 29efb83c47f..d4d408caeea 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,5 +1,5 @@ { - "infra/blueprint-test": "0.16.1", + "infra/blueprint-test": "0.16.2", "infra/module-swapper": "0.4.8", "tflint-ruleset-blueprint": "0.2.4" } diff --git a/infra/blueprint-test/CHANGELOG.md b/infra/blueprint-test/CHANGELOG.md index a0ace9c15b1..0e9b09ef733 100644 --- a/infra/blueprint-test/CHANGELOG.md +++ b/infra/blueprint-test/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [0.16.2](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/compare/infra/blueprint-test/v0.16.1...infra/blueprint-test/v0.16.2) (2024-09-05) + + +### Bug Fixes + +* **deps:** update github.com/hashicorp/terraform-config-inspect digest to 6714b46 ([#2488](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/issues/2488)) ([ca03f44](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/commit/ca03f449f2ee9c928e702b8520e823cca83d445a)) +* **deps:** update module github.com/gruntwork-io/terratest to v0.47.1 ([#2578](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/issues/2578)) ([490d63b](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/commit/490d63bf25395f71ad571cb7ade136663cafebef)) +* **deps:** update module github.com/tidwall/gjson to v1.17.3 ([#2474](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/issues/2474)) ([7fe2b66](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/commit/7fe2b66489a4cf3be5d6451ca3177bfeb5c94249)) +* **deps:** update module golang.org/x/mod to v0.20.0 ([#2512](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/issues/2512)) ([13973f0](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/commit/13973f0a4aade9b6a1bb24210a9a0d7038416cae)) +* **deps:** update module golang.org/x/mod to v0.21.0 ([#2574](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/issues/2574)) ([e288615](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/commit/e288615361472de1940ca092388439864749cba1)) + ## [0.16.1](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/compare/infra/blueprint-test/v0.16.0...infra/blueprint-test/v0.16.1) (2024-07-23) From 3081bdc1f6710674330c337aac74484df3e4daa1 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 6 Sep 2024 01:33:31 +0200 Subject: [PATCH 6/6] chore(deps): update terraform google provider to v6 (#2579) Co-authored-by: Andrew Peabody --- .../test-org/ci-triggers/.terraform.lock.hcl | 56 +++++++++---------- infra/terraform/test-org/ci-triggers/logs.tf | 2 +- .../test-org/ci-triggers/versions.tf | 4 +- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/infra/terraform/test-org/ci-triggers/.terraform.lock.hcl b/infra/terraform/test-org/ci-triggers/.terraform.lock.hcl index 850cd5f3bc8..f34e75026cd 100644 --- a/infra/terraform/test-org/ci-triggers/.terraform.lock.hcl +++ b/infra/terraform/test-org/ci-triggers/.terraform.lock.hcl @@ -2,41 +2,41 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "5.10.0" - constraints = ">= 4.46.0, < 6.0.0" + version = "5.43.1" + constraints = ">= 2.18.0, >= 4.46.0, < 6.0.0, < 7.0.0" hashes = [ - "h1:3kD/GqYmZkA97ebToXu6qhhrwo+GQNmqq9xv30Qkhmw=", - "zh:0f6a1feb5b3a128be6ef5fe0400ed800310a67e799c18aec7442161bb6d3ba36", - "zh:13d591ba78e424c94ce5caaf176ab6b087b0e3af08a7b6bcd963673698cdefda", - "zh:3bef54a2b24b06eef99f3df02e0fe4ac97f018c89f83e0faeb4ade921962565b", - "zh:3f3755b8f5b9db1611d42a02c21f03c54577e4aad3cf93323792f131c671c050", - "zh:61516eec734714ac48b565bee93cc2532160d1b4bd0320753799b829083b7060", - "zh:9160848ad0b9becb522a0744dcb89474849906aa2436ed945c658fe201a724b0", - "zh:aa5e79b01949cfedd874bf52958f90cf8f7d202600126c872127a9a156a3c17b", - "zh:cef73a67031008b7d7ef3edfbcd5e1a9b04c0f2580d815401248025b741bc8e4", - "zh:d2ad21ff9e9d2ad04146591c1b5784075e6df73e2bd243efd8d227d764b80b6e", + "h1:kKqTi+6TS7GCMKFbwf0aTA3FwZtJTaAtagGEZAFbCEg=", + "zh:40b46223d3804c32b8e1e8e16ba057230a774d9f250896d8d410272ed5b14318", + "zh:95a2f2b029b9f9dc0311f0a81d1d2ef41b0a19b4cfb50393c2ece23f53fcd785", + "zh:a8263fbc090c80c8c21b4278f7fedaeb792b5f6061b9e5182ce8aa69fc828035", + "zh:ac900b372ac879691cdc0bf149baee3a11a37d4102e30a4931f6cfd960f5c852", + "zh:ae336bee99114a98327141ef6555aa5953a87ce216f0f105c88a88947d477d2c", + "zh:babe5974f850610746111264e897d9d7ac1c44e17e81ffef53d28059e3019453", + "zh:c7f77ac8e07e488432d6b45688e2a45f1bded82d9914666136b7e50a74ab6fd9", + "zh:d5dd46a0bbf783141d0592043720c61ea055a359986f50bdbfd6fc5d03aae68c", + "zh:d805f8abc5e3d547bc9964ccc7d87e687add92397b2e3fedb40afcda7d93dca8", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:f58b145081d20bce52e14bee0de73f5c018bc39b8c4736e23e1329df32f8bd45", - "zh:fb82f6b5d1f992243ab8fe417659cdf9831202cf1e16fe7593d3967888b035cc", + "zh:f678f3ee9d96b373d582d8012dcceca446f4891b9d1593447023b04137a6529e", + "zh:f6a75d48a0be31ee42b1db22b3ad9af2ead170bdd9f023ec8fb292b861b5fa3a", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "5.10.0" - constraints = ">= 2.18.0, < 6.0.0" + version = "6.1.0" + constraints = ">= 2.18.0, < 7.0.0" hashes = [ - "h1:V+p4T5z6Mt6rFDupT/piBUFMg4zGJ153sawqNvqYWS0=", - "zh:1004ac3733679254abcc7f5e9d594d9ee079cf071391a92f82b50077e07c70b5", - "zh:1e25af33d20b6ab369860d5b7c746b4a3b3dccc061b14dde91b6ccccfe704cc4", - "zh:2873a614a1dc1c460246edc95a558ad9befedf93490a0204bee8fb95362813cc", - "zh:2f421e13247b3822ef3c2e07e1aee948116a5064c386466a53fb72486daded20", - "zh:517c13cd146d3451789da8f13cbfa5355c3e88456cf762ad3918dada84a5f261", - "zh:56553ae44f4089f5149551714daaf3c97205d4638dd93b0675ed777476d56048", - "zh:6925a07bcb9ab70faa84bf36f87990025e3f9cd6c8cfab5260877f60086c8161", - "zh:72454b65ee4a24896d215f7f7af41e31336865c86d6c20ea4acb63596e75ac0d", - "zh:8b05f8a6ff51999bf65e3127618931647a00bc9abf739f0711151e4145cae3d5", - "zh:a3b7d3b39740088174d121bc7e4e3ce27da0ebf0c87877f8fce9277b0046c75b", + "h1:AEOTKPFbO8SKMOCBhzANkGST9yjGKO6OXjEScROE8Ro=", + "zh:3ea706aa701755ed212a13ebfc0332a587738add77f7433449ec0b0bde9ba6f3", + "zh:5025a74240983a7a55c1496b124da4193f23dec751dec203e1801439e6c232af", + "zh:535fe811841e7ce06050b66f4d32d5812df17cf942c15d3063c8d29197733938", + "zh:66e81f66c2bc4e2d325b537f9e9e51ea4ca4d1015b8c7ee8bdca74c6fc1f41b6", + "zh:71ebb3ba56666ba38424acebb5b149df10cb31f68e268e7be6ec66046c9e83b3", + "zh:8c798beb2516f726324289a06eb6956c88905c2a385e4cf18830c5210d9abc64", + "zh:9110f27d1c5cf2b797162c17ab75c47c856f8273fb66dbf26b3d2fe5b1a9b105", + "zh:a85f6ed96ade11563eaa3c8ab25e36c4a8abea8f3de2c59a2a318a110903d110", + "zh:aec1733cbe018418f62182b06f982ecaa32888398f93072cf5300523e9c6763d", + "zh:b58eb8b422eb6c576f1b597c1bcda618ef143d6acc9663730e9b4ce55e035814", + "zh:b5984d64c9bf7ac5e27b9fdbcc44fd206b320259007b5c7fc6e3c975b0762478", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fe2af4fcda1b45d73ef8b8c728c150e00d1a4d5c0323b30d7d43c6f24ed78bcb", ] } diff --git a/infra/terraform/test-org/ci-triggers/logs.tf b/infra/terraform/test-org/ci-triggers/logs.tf index 9eedfa84391..43a64acc18d 100644 --- a/infra/terraform/test-org/ci-triggers/logs.tf +++ b/infra/terraform/test-org/ci-triggers/logs.tf @@ -16,7 +16,7 @@ module "filelogs_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 5.0" + version = "~> 6.1" name = "${local.project_id}-filelogs" project_id = local.project_id diff --git a/infra/terraform/test-org/ci-triggers/versions.tf b/infra/terraform/test-org/ci-triggers/versions.tf index 30a8eb20698..34f1e6a9f7f 100644 --- a/infra/terraform/test-org/ci-triggers/versions.tf +++ b/infra/terraform/test-org/ci-triggers/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google-beta = { source = "hashicorp/google-beta" - version = ">= 2.18, < 6" + version = ">= 2.18, < 7" } google = { source = "hashicorp/google" - version = ">= 2.18, < 6" + version = ">= 2.18, < 7" } } }