input
listlengths 2
2
| ideal
stringclasses 4
values |
|---|---|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Cloud Storage security change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n:robot: I have created a release *beep* *boop*\n---\n\n\n## [11.1.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v11.0.0...v11.1.0) (2025-08-28)\n\n\n### Features\n\n* **deps:** Update Terraform google to v7 ([#415](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/415)) ([c6e20af](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/c6e20af4dcfdf3d0bd9cc44b5252900758ea694c))\n* per module requirements configs to cloud-storage ([#410](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/410)) ([f6725eb](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/f6725eb1c3db1a4aa6a1286d9226c4b45a2cf751))\n\n\n### Bug Fixes\n\n* added missing validations ([#414](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/414)) ([f98a696](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/f98a69659ce9e778aef655e6b60aeeb533d51d13))\n\n---\nThis PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).\n\n---\n\nChoice A:\nCHANGELOG.md\n@@ -7,6 +7,19 @@ The format is based on\n and this project adheres to\n [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n \n+## [11.1.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v11.0.0...v11.1.0) (2025-08-28)\n+\n+\n+### Features\n+\n+* **deps:** Update Terraform google to v7 ([#415](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/415)) ([c6e20af](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/c6e20af4dcfdf3d0bd9cc44b5252900758ea694c))\n+* per module requirements configs to cloud-storage ([#410](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/410)) ([f6725eb](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/f6725eb1c3db1a4aa6a1286d9226c4b45a2cf751))\n+\n+\n+### Bug Fixes\n+\n+* added missing validations ([#414](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/414)) ([f98a696](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/f98a69659ce9e778aef655e6b60aeeb533d51d13))\n+\n ## [11.0.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.2...v11.0.0) (2025-05-30)\n \n \n---\nREADME.md\n@@ -24,7 +24,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"gcs_buckets\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n- version = \"~> 11.0\"\n+ version = \"~> 11.1\"\n project_id = \"<PROJECT ID>\"\n names = [\"first\", \"second\"]\n prefix = \"my-unique-prefix\"\n---\nmetadata.yaml\n@@ -24,7 +24,7 @@ spec:\n source:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n- version: 11.0.0\n+ version: 11.1.0\n actuationTool:\n flavor: Terraform\n version: \">= 1.3\"\n---\nmodules/simple_bucket/README.md\n@@ -18,7 +18,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"bucket\" {\n source = \"terraform-google-modules/cloud-storage/google//modules/simple_bucket\"\n- version = \"~> 11.0\"\n+ version = \"~> 11.1\"\n \n name = \"example-bucket\"\n project_id = \"example-project\"\n---\nmodules/simple_bucket/metadata.yaml\n@@ -25,7 +25,7 @@ spec:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n dir: /modules/simple_bucket\n- version: 11.0.0\n+ version: 11.1.0\n actuationTool:\n flavor: Terraform\n version: \">= 1.3\"\n---\nmodules/simple_bucket/versions.tf\n@@ -25,7 +25,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v11.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v11.1.0\"\n }\n \n }\n---\nversions.tf\n@@ -30,7 +30,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage/v11.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage/v11.1.0\"\n }\n \n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -7,6 +7,19 @@ The format is based on\n and this project adheres to\n [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n \n+## [11.1.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v11.0.0...v11.1.0) (2025-08-28)\n+\n+\n+### Features\n+\n+* **deps:** Update Terraform google to v7 ([#415](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/415)) ([c6e20af](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/c6e20af4dcfdf3d0bd9cc44b5252900758ea694c))\n+* per module requirements configs to cloud-storage ([#410](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/410)) ([f6725eb](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/f6725eb1c3db1a4aa6a1286d9226c4b45a2cf751))\n+\n+\n+### Bug Fixes\n+\n+* added missing validations ([#414](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/414)) ([f98a696](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/f98a69659ce9e778aef655e6b60aeeb533d51d13))\n+\n ## [11.0.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.2...v11.0.0) (2025-05-30)\n \n \n---\nREADME.md\n@@ -24,7 +24,7 @@ Basic usage of this version is as follows:\n ```hcl\n module \"gcs_buckets\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n- version = \"~> 11.0\"\n+ version = \"~> 11.1\"\n project_id = \"<PROJECT ID>\"\n names = [\"first\", \"second\"]\n prefix = \"my-unique-prefix\"\n---\nmetadata.yaml\n@@ -24,7 +24,7 @@ spec:\n source:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n- version: 11.0.0\n+ version: 11.1.0\n actuationTool:\n flavor: Terraform\n version: \">= 1.3\"\n---\nmodules/simple_bucket/README.md\n@@ -18,7 +18,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"bucket\" {\n source = \"terraform-google-modules/cloud-storage/google//modules/simple_bucket\"\n- version = \"~> 11.0\"\n+ version = \"~> 11.1\"\n \n name = \"example-bucket\"\n project_id = \"example-project\"\n---\nmodules/simple_bucket/metadata.yaml\n@@ -25,7 +25,7 @@ spec:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n dir: /modules/simple_bucket\n- version: 11.0.0\n+ version: 11.1.0\n actuationTool:\n flavor: Terraform\n version: \">= 1.3\"\n---\nmodules/simple_bucket/versions.tf\n@@ -25,7 +25,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v11.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v11.1.0\"\n }\n \n }\n---\nversions.tf\n@@ -30,7 +30,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage/v11.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage/v11.1.0\"\n }\n \n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -7,6 +7,19 @@ The format is based on\n and this project adheres to\n [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n \n+## [11.1.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v11.0.0...v11.1.0) (2025-08-28)\n+\n+\n+### Features\n+\n+* **deps:** Update Terraform google to v7 ([c6e20af](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/c6e20af4dcfdf3d0bd9cc44b5252900758ea694c))\n+* per module requirements configs to cloud-storage ([#410](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/410)) ([f6725eb](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/f6725eb1c3db1a4aa6a1286d9226c4b45a2cf751))\n+\n+\n+### Bug Fixes\n+\n+* added missing validations ([#414](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/414)) ([f98a696](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/f98a69659ce9e778aef655e6b60aeeb533d51d13))\n+\n ## [11.0.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.2...v11.0.0) (2025-05-30)\n \n \n---\nREADME.md\n@@ -24,7 +24,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"gcs_buckets\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n- version = \"~> 11.0\"\n+ version = \"~> 11.1\"\n project_id = \"<PROJECT ID>\"\n names = [\"first\", \"second\"]\n prefix = \"my-unique-prefix\"\n---\nmetadata.yaml\n@@ -24,7 +24,7 @@ spec:\n source:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n- version: 11.0.0\n+ version: 11.1.0\n actuationTool:\n flavor: Terraform\n version: \">= 1.3\"\n---\nmodules/simple_bucket/README.md\n@@ -18,7 +18,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"bucket\" {\n source = \"terraform-google-modules/cloud-storage/google//modules/simple_bucket\"\n- version = \"~> 11.0\"\n+ version = \"~> 11.1\"\n \n name = \"example-bucket\"\n project_id = \"example-project\"\n---\nmodules/simple_bucket/metadata.yaml\n@@ -25,7 +25,7 @@ spec:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n dir: /modules/simple_bucket\n- version: 11.0.0\n+ version: 11.1.0\n actuationTool:\n flavor: Terraform\n version: \">= 1.3\"\n---\nmodules/simple_bucket/versions.tf\n@@ -25,7 +25,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v11.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v11.1.0\"\n }\n \n }\n---\nversions.tf\n@@ -30,7 +30,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage/v11.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage/v11.1.0\"\n }\n \n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -7,6 +7,19 @@ The format is based on\n and this project adheres to\n [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n \n+## [11.1.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v11.0.0...v11.1.0) (2025-08-28)\n+\n+\n+### Features\n+\n+* **deps:** Update Terraform google to v7 ([#415](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/415)) ([c6e20af](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/c6e20af4dcfdf3d0bd9cc44b5252900758ea694c))\n+* +30,7 module requirements configs to cloud-storage ([#410](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/410)) ([f6725eb](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/f6725eb1c3db1a4aa6a1286d9226c4b45a2cf751))\n+\n+\n+### Bug Fixes\n+\n+* added missing validations ([#414](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/414)) ([f98a696](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/f98a69659ce9e778aef655e6b60aeeb533d51d13))\n+\n ## [11.0.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.2...v11.0.0) (2025-05-30)\n \n \n---\nREADME.md\n@@ -24,7 +24,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"gcs_buckets\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n- version = \"~> 11.0\"\n+ version = \"~> 11.1\"\n project_id = \"<PROJECT ID>\"\n names = [\"first\", \"second\"]\n prefix = \"my-unique-prefix\"\n---\nmetadata.yaml\n@@ -24,7 +24,7 @@ spec:\n source:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n- version: 11.0.0\n+ version: 11.1.0\n actuationTool:\n flavor: Terraform\n version: \">= 1.3\"\n---\nmodules/simple_bucket/README.md\n@@ -18,7 +18,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"bucket\" {\n source = \"terraform-google-modules/cloud-storage/google//modules/simple_bucket\"\n- version = \"~> 11.0\"\n+ version = \"~> 11.1\"\n \n name = \"example-bucket\"\n project_id = \"example-project\"\n---\nmodules/simple_bucket/metadata.yaml\n@@ -25,7 +25,7 @@ spec:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n dir: /modules/simple_bucket\n- version: 11.0.0\n+ version: 11.1.0\n actuationTool:\n flavor: Terraform\n version: \">= 1.3\"\n---\nmodules/simple_bucket/versions.tf\n@@ -25,7 +25,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v11.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v11.1.0\"\n }\n \n }\n---\nversions.tf\n@@ -30,7 +30,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage/v11.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage/v11.1.0\"\n }\n \n }\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Cloud Storage security change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [terraform-google-modules/cloud-storage/google](https://registry.terraform.io/modules/terraform-google-modules/cloud-storage/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-storage)) | module | major | `~> 10.0` -> `~> 11.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-cloud-storage (terraform-google-modules/cloud-storage/google)</summary>\n\n### [`v11.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-storage/blob/HEAD/CHANGELOG.md#1100-2025-05-30)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.2...v11.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **tf>=1.3:** bump TF to >=1.3 ([#​367](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-storage/issues/367))\n- add hierarchical namespace flag ([#​375](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-storage/issues/375))\n\n##### Features\n\n- add hierarchical namespace flag ([#​375](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-storage/issues/375)) ([b65e3eb](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-storage/commit/b65e3ebf1c4df261355afb57e63fbd033cb8ea36))\n\n##### Bug Fixes\n\n- **tf>=1.3:** bump TF to >=1.3 ([#​367](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-storage/issues/367)) ([b5b0362](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-storage/commit/b5b036297c8761b05a60aaeb21dd822f4e360e36))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-cloud-storage).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC40MC4zIiwidXBkYXRlZEluVmVyIjoiNDAuNDAuMyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\nexamples/multiple_buckets/main.tf\n@@ -22,7 +22,7 @@ resource \"random_string\" \"prefix\" {\n \n module \"cloud_storage\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = var.project_id\n \n---\nexamples/simple_bucket/main.tf\n@@ -16,7 +16,7 @@\n \n module \"bucket\" {\n source = \"terraform-google-modules/cloud-storage/google//modules/simple_bucket\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n name = \"${var.project_id}-bucket\"\n project_id = var.project_id\n---\n\n\n---\n\nChoice B:\nexamples/multiple_buckets/main.tf\n@@ -22,7 +22,7 @@ resource \"random_string\" \"prefix\" {\n \n module \"cloud_storage\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n- version = \"~> 10.0\"\n+ \n version = \"~> 11.0\"\n \n project_id = var.project_id\n \n---\nexamples/simple_bucket/main.tf\n@@ -16,7 +16,7 @@\n \n module \"bucket\" {\n source = \"terraform-google-modules/cloud-storage/google//modules/simple_bucket\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n name = \"${var.project_id}-bucket\"\n project_id = var.project_id\n---\n\n\n---\n\nChoice C:\nexamples/multiple_buckets/main.tf\n@@ -22,7 +22,7 @@ resource \"random_string\" \"prefix\" {\n \n module \"cloud_storage\" {\n source source = \"terraform-google-modules/cloud-storage/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = var.project_id\n \n---\nexamples/simple_bucket/main.tf\n@@ -16,7 +16,7 @@\n \n module \"bucket\" {\n source = \"terraform-google-modules/cloud-storage/google//modules/simple_bucket\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n name = \"${var.project_id}-bucket\"\n project_id = var.project_id\n---\n\n\n---\n\nChoice D:\nexamples/multiple_buckets/main.tf\n@@ -22,7 +22,7 @@ resource \"random_string\" \"prefix\" = \n module \"cloud_storage\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = var.project_id\n \n---\nexamples/simple_bucket/main.tf\n@@ -16,7 +16,7 @@\n \n module \"bucket\" {\n source = \"terraform-google-modules/cloud-storage/google//modules/simple_bucket\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n name = \"${var.project_id}-bucket\"\n project_id = var.project_id\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Cloud Storage security change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Type | Update | Change | Pending |\n|---|---|---|---|---|\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 6.9.0, < 7` -> `>= 6.9.0, < 8` | `7.0.1` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>hashicorp/terraform-provider-google (google)</summary>\n\n### [`v7.0.0`](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v6.49.2...v7.0.0)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v6.49.2...v7.0.0)\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-cloud-storage).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS44Mi43IiwidXBkYXRlZEluVmVyIjoiNDEuODIuNyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\nmodules/simple_bucket/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n \n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.9.0, 7\"\n+ version = \">= 6.9.0, < 8\"\n }\n }\n \n---\nversions.tf\n@@ -20,7 +20,7 @@ terraform {\n \n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.9.0, < 7\"\n+ version = \">= 6.9.0, < 8\"\n }\n \n random = {\n---\n\n\n---\n\nChoice B:\nmodules/simple_bucket/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n \n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.9.0, < 7\"\n+ version = \">= 6.9.0, < 8\"\n }\n }\n \n---\nversions.tf\n@@ -20,7 +20,7 @@ terraform {\n \n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.9.0, < 7\"\n+ version = \">= 6.9.0, < 8\"\n }\n \n random = {\n---\n\n\n---\n\nChoice C:\nmodules/simple_bucket/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n \n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.9.0, < 7\"\n+ = \">= 6.9.0, < 8\"\n }\n }\n \n---\nversions.tf\n@@ -20,7 +20,7 @@ terraform {\n \n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.9.0, < 7\"\n+ version = \">= 6.9.0, < 8\"\n }\n \n random = {\n---\n\n\n---\n\nChoice D:\nmodules/simple_bucket/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n \n google = {\n source {\n---\n = \"hashicorp/google\"\n- version = \">= 6.9.0, < 7\"\n+ version = \">= 6.9.0, < 8\"\n }\n }\n \n---\nversions.tf\n@@ -20,7 +20,7 @@ terraform {\n \n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.9.0, < 7\"\n+ version = \">= 6.9.0, < 8\"\n }\n \n random = {\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Cloud Storage security change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nIntroduced:\r\n\r\n- per_module_roles: to config required roles to run each sub modules.\r\n- per_module_service: to config required services to run each sub modules.\r\n\r\nAdded feature flag `--per-module-requirements` to generate_docs cmd, to align with the per module configs.\n\n---\n\nChoice A:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.24\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.25.4\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n@@ -86,7 +86,7 @@ docker_generate_docs:\n \t -e ENABLE_BPMETADATA \\\n \t\t-v $(CURDIR):/workspace \\\n \t\t$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \\\n-\t\t/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs'\n+\t\t/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs --per-module-requirements'\n \n # Alias for backwards compatibility\n .PHONY: generate_docs\n---\nmetadata.yaml\n@@ -27,7 +27,7 @@ spec:\n version: 11.0.0\n actuationTool:\n flavor: Terraform\n- version: \">= 0.13\"\n+ version: \">= 1.3\"\n description: {}\n content:\n subBlueprints:\n@@ -701,18 +701,18 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/cloudkms.cryptoKeyEncrypterDecrypter\n- - - roles/iam.serviceAccountUser\n+ - roles/resourcemanager.projectIamAdmin\n+ - roles/serviceusage.serviceUsageAdmin\n - roles/storage.admin\n+ - roles/iam.serviceAccountAdmin\n+ - roles/iam.serviceAccountUser\n services:\n- - cloudkms.googleapis.com\n - cloudresourcemanager.googleapis.com\n- - compute.googleapis.com\n - iam.googleapis.com\n - serviceusage.googleapis.com\n- - storage-api.googleapis.com\n+ - storage.googleapis.com\n providerVersions:\n - source: hashicorp/google\n- version: \">= 5.43.0, < 7\"\n+ version: \">= 6.9.0, < 7\"\n - source: hashicorp/random\n version: \">= 2.1\"\n---\nmodules/simple_bucket/metadata.yaml\n@@ -28,7 +28,7 @@ spec:\n version: 11.0.0\n actuationTool:\n flavor: Terraform\n- version: \">= 0.13\"\n+ version: \">= 1.3\"\n description: {}\n content:\n examples:\n@@ -97,7 +97,7 @@ spec:\n varType: bool\n defaultValue: false\n - name: hierarchical_namespace\n- description: While set to true, hierarchical namespace is enabled for this bucket.\n+ description: When set to true, hierarchical namespace is enable for this bucket.\n varType: bool\n defaultValue: false\n - name: retention_policy\n@@ -351,16 +351,14 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/cloudkms.cryptoKeyEncrypterDecrypter\n- - roles/iam.serviceAccountUser\n - roles/storage.admin\n+ - roles/iam.serviceAccountUser\n+ - roles/cloudkms.admin\n+ - roles/logging.logWriter\n services:\n - cloudkms.googleapis.com\n- - cloudresourcemanager.googleapis.com\n- - compute.googleapis.com\n - iam.googleapis.com\n- - serviceusage.googleapis.com\n- - storage-api.googleapis.com\n+ - storage.googleapis.com\n providerVersions:\n - source: hashicorp/google\n- version: \">= 5.43.0, < 7\"\n+ version: \">= 6.9.0, < 7\"\n---\ntest/setup/iam.tf\n@@ -15,11 +15,27 @@\n */\n \n locals {\n- int_required_roles = [\n+ per_module_roles = {\n+ simple_bucket = [\n+ \"roles/storage.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ \"roles/cloudkms.admin\",\n+ \"roles/logging.logWriter\",\n+ ]\n+ root = [\n+ \"roles/resourcemanager.projectIamAdmin\",\n+ \"roles/serviceusage.serviceUsageAdmin\",\n+ \"roles/storage.admin\",\n+ \"roles/iam.serviceAccountAdmin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ]\n+ }\n+\n+ int_required_roles = concat([\n \"roles/cloudkms.cryptoKeyEncrypterDecrypter\",\n \"roles/iam.serviceAccountUser\",\n \"roles/storage.admin\",\n- ]\n+ ], flatten(values(local.per_module_roles)))\n }\n \n resource \"google_service_account\" \"int_test\" {\n---\ntest/setup/main.tf\n@@ -14,6 +14,22 @@\n * limitations under the License.\n */\n \n+locals {\n+ per_module_services = {\n+ simple_bucket = [\n+ \"storage.googleapis.com\",\n+ \"cloudkms.googleapis.com\",\n+ \"iam.googleapis.com\",\n+ ]\n+ root = [\n+ \"storage.googleapis.com\",\n+ \"iam.googleapis.com\",\n+ \"serviceusage.googleapis.com\",\n+ \"cloudresourcemanager.googleapis.com\",\n+ ]\n+ }\n+}\n+\n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n version = \"~> 18.0\"\n@@ -24,12 +40,10 @@ module \"project\" {\n folder_id = var.folder_id\n billing_account = var.billing_account\n \n- activate_apis = [\n- \"cloudkms.googleapis.com\",\n+ activate_apis = concat([\n \"cloudresourcemanager.googleapis.com\",\n \"compute.googleapis.com\",\n- \"iam.googleapis.com\",\n \"serviceusage.googleapis.com\",\n \"storage-api.googleapis.com\",\n- ]\n+ ], flatten(values(local.per_module_services)))\n }\n---\n\n\n---\n\nChoice B:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.24\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.25.4\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n@@ -86,7 +86,7 @@ docker_generate_docs:\n \t -e ENABLE_BPMETADATA \\\n \t\t-v $(CURDIR):/workspace \\\n \t\t$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \\\n-\t\t/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs'\n+\t\t/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs --per-module-requirements'\n \n # Alias for backwards compatibility\n .PHONY: generate_docs\n---\nmetadata.yaml\n@@ -27,7 +27,7 @@ spec:\n version: 11.0.0\n actuationTool:\n flavor: Terraform\n- version: \">= 0.13\"\n+ version: \">= 1.3\"\n description: {}\n content:\n subBlueprints:\n@@ -701,18 +701,18 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/cloudkms.cryptoKeyEncrypterDecrypter\n- - roles/iam.serviceAccountUser\n+ - roles/resourcemanager.projectIamAdmin\n+ - roles/serviceusage.serviceUsageAdmin\n - roles/storage.admin\n+ - roles/iam.serviceAccountAdmin\n+ - roles/iam.serviceAccountUser\n services:\n- - cloudkms.googleapis.com\n - cloudresourcemanager.googleapis.com\n- - compute.googleapis.com\n - iam.googleapis.com\n - serviceusage.googleapis.com\n- - storage-api.googleapis.com\n+ - storage.googleapis.com\n providerVersions:\n - source: hashicorp/google\n- version: \">= 5.43.0, < 7\"\n+ version: \">= 6.9.0, < 7\"\n - source: hashicorp/random\n version: \">= 2.1\"\n---\nmodules/simple_bucket/metadata.yaml\n@@ -28,7 +28,7 @@ spec:\n version: 11.0.0\n actuationTool:\n flavor: Terraform\n- version: \">= 0.13\"\n+ version: \">= 1.3\"\n description: {}\n content:\n examples:\n@@ -97,7 +97,7 @@ spec:\n varType: bool\n defaultValue: false\n - name: hierarchical_namespace\n- description: While set to true, hierarchical namespace is enabled for this bucket.\n+ description: When set to true, hierarchical namespace is enable for this bucket.\n varType: bool\n defaultValue: false\n - name: retention_policy\n@@ -351,16 +351,14 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/cloudkms.cryptoKeyEncrypterDecrypter\n- - roles/iam.serviceAccountUser\n - roles/storage.admin\n+ - roles/iam.serviceAccountUser\n+ - roles/cloudkms.admin\n+ - roles/logging.logWriter\n services:\n - cloudkms.googleapis.com\n- - cloudresourcemanager.googleapis.com\n- - compute.googleapis.com\n - iam.googleapis.com\n- - serviceusage.googleapis.com\n- - storage-api.googleapis.com\n+ - storage.googleapis.com\n providerVersions:\n - source: hashicorp/google\n- version: \">= 5.43.0, < 7\"\n+ version: \">= 6.9.0, < 7\"\n---\ntest/setup/iam.tf\n@@ -15,11 +15,27 @@\n */\n \n locals {\n- int_required_roles = [\n+ per_module_roles = {\n+ simple_bucket = [\n+ \"roles/storage.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ \"roles/cloudkms.admin\",\n+ \"roles/logging.logWriter\",\n+ ]\n+ root = [\n+ \"roles/resourcemanager.projectIamAdmin\",\n+ \"roles/serviceusage.serviceUsageAdmin\",\n+ \"roles/storage.admin\",\n+ \"roles/iam.serviceAccountAdmin\",\n+ \"roles/iam.serviceAccountUser\",\n+ }\n+\n+ int_required_roles = concat([\n \"roles/cloudkms.cryptoKeyEncrypterDecrypter\",\n \"roles/iam.serviceAccountUser\",\n \"roles/storage.admin\",\n- ]\n+ ], flatten(values(local.per_module_roles)))\n }\n \n resource \"google_service_account\" \"int_test\" {\n---\ntest/setup/main.tf\n@@ -14,6 +14,22 @@\n * limitations under the License.\n */\n \n+locals {\n+ per_module_services = {\n+ simple_bucket = [\n+ \"storage.googleapis.com\",\n+ \"cloudkms.googleapis.com\",\n+ \"iam.googleapis.com\",\n+ ]\n+ root = [\n+ \"storage.googleapis.com\",\n+ \"iam.googleapis.com\",\n+ \"serviceusage.googleapis.com\",\n+ \"cloudresourcemanager.googleapis.com\",\n+ ]\n+ }\n+}\n+\n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n version = \"~> 18.0\"\n@@ -24,12 +40,10 @@ module \"project\" {\n folder_id = var.folder_id\n billing_account = var.billing_account\n \n- activate_apis = [\n- \"cloudkms.googleapis.com\",\n+ activate_apis = concat([\n \"cloudresourcemanager.googleapis.com\",\n \"compute.googleapis.com\",\n- \"iam.googleapis.com\",\n \"serviceusage.googleapis.com\",\n \"storage-api.googleapis.com\",\n- ]\n+ ], flatten(values(local.per_module_services)))\n }\n---\n\n\n---\n\nChoice C:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.24\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.25.4\n DOCKER_IMAGE_DEVELOPER_TOOLS := REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n@@ -86,7 +86,7 @@ docker_generate_docs:\n \t -e ENABLE_BPMETADATA \\\n \t\t-v $(CURDIR):/workspace \\\n \t\t$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \\\n-\t\t/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs'\n+\t\t/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs --per-module-requirements'\n \n # Alias for backwards compatibility\n .PHONY: generate_docs\n---\nmetadata.yaml\n@@ -27,7 +27,7 @@ spec:\n version: 11.0.0\n actuationTool:\n flavor: Terraform\n- version: \">= 0.13\"\n+ version: \">= 1.3\"\n description: {}\n content:\n subBlueprints:\n@@ -701,18 +701,18 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/cloudkms.cryptoKeyEncrypterDecrypter\n- - roles/iam.serviceAccountUser\n+ - roles/resourcemanager.projectIamAdmin\n+ - roles/serviceusage.serviceUsageAdmin\n - roles/storage.admin\n+ - roles/iam.serviceAccountAdmin\n+ - roles/iam.serviceAccountUser\n services:\n- - cloudkms.googleapis.com\n - cloudresourcemanager.googleapis.com\n- - compute.googleapis.com\n - iam.googleapis.com\n - serviceusage.googleapis.com\n- - storage-api.googleapis.com\n+ - storage.googleapis.com\n providerVersions:\n - source: hashicorp/google\n- version: \">= 5.43.0, < 7\"\n+ version: \">= 6.9.0, < 7\"\n - source: hashicorp/random\n version: \">= 2.1\"\n---\nmodules/simple_bucket/metadata.yaml\n@@ -28,7 +28,7 @@ spec:\n version: 11.0.0\n actuationTool:\n flavor: Terraform\n- version: \">= 0.13\"\n+ version: \">= 1.3\"\n description: {}\n content:\n examples:\n@@ -97,7 +97,7 @@ spec:\n varType: bool\n defaultValue: false\n - name: hierarchical_namespace\n- description: While set to true, hierarchical namespace is enabled for this bucket.\n+ description: When set to true, hierarchical namespace is enable for this bucket.\n varType: bool\n defaultValue: false\n - name: retention_policy\n@@ -351,16 +351,14 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/cloudkms.cryptoKeyEncrypterDecrypter\n- - roles/iam.serviceAccountUser\n - roles/storage.admin\n+ - roles/iam.serviceAccountUser\n+ - roles/cloudkms.admin\n+ - roles/logging.logWriter\n services:\n - cloudkms.googleapis.com\n- - cloudresourcemanager.googleapis.com\n- - compute.googleapis.com\n - iam.googleapis.com\n- - serviceusage.googleapis.com\n- - storage-api.googleapis.com\n+ - storage.googleapis.com\n providerVersions:\n - source: hashicorp/google\n- version: \">= 5.43.0, < 7\"\n+ version: \">= 6.9.0, < 7\"\n---\ntest/setup/iam.tf\n@@ -15,11 +15,27 @@\n */\n \n locals {\n- int_required_roles = [\n+ per_module_roles = {\n+ simple_bucket = [\n+ \"roles/storage.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ \"roles/cloudkms.admin\",\n+ \"roles/logging.logWriter\",\n+ ]\n+ root = [\n+ \"roles/resourcemanager.projectIamAdmin\",\n+ \"roles/serviceusage.serviceUsageAdmin\",\n+ \"roles/storage.admin\",\n+ \"roles/iam.serviceAccountAdmin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ]\n+ }\n+\n+ int_required_roles = concat([\n \"roles/cloudkms.cryptoKeyEncrypterDecrypter\",\n \"roles/iam.serviceAccountUser\",\n \"roles/storage.admin\",\n- ]\n+ ], flatten(values(local.per_module_roles)))\n }\n \n resource \"google_service_account\" \"int_test\" {\n---\ntest/setup/main.tf\n@@ -14,6 +14,22 @@\n * limitations under the License.\n */\n \n+locals {\n+ per_module_services = {\n+ simple_bucket = [\n+ \"storage.googleapis.com\",\n+ \"cloudkms.googleapis.com\",\n+ \"iam.googleapis.com\",\n+ ]\n+ root = [\n+ \"storage.googleapis.com\",\n+ \"iam.googleapis.com\",\n+ \"serviceusage.googleapis.com\",\n+ \"cloudresourcemanager.googleapis.com\",\n+ ]\n+ }\n+}\n+\n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n version = \"~> 18.0\"\n@@ -24,12 +40,10 @@ module \"project\" {\n folder_id = var.folder_id\n billing_account = var.billing_account\n \n- activate_apis = [\n- \"cloudkms.googleapis.com\",\n+ activate_apis = concat([\n \"cloudresourcemanager.googleapis.com\",\n \"compute.googleapis.com\",\n- \"iam.googleapis.com\",\n \"serviceusage.googleapis.com\",\n \"storage-api.googleapis.com\",\n- ]\n+ ], flatten(values(local.per_module_services)))\n }\n---\n\n\n---\n\nChoice D:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.24\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.25.4\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n@@ -86,7 +86,7 @@ docker_generate_docs:\n \t -e ENABLE_BPMETADATA \\\n \t\t-v $(CURDIR):/workspace \\\n \t\t$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \\\n-\t\t/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs'\n+\t\t/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs --per-module-requirements'\n \n # Alias for backwards compatibility\n .PHONY: generate_docs\n---\nmetadata.yaml\n@@ -27,7 +27,7 @@ spec:\n version: 11.0.0\n actuationTool:\n flavor: Terraform\n- version: \">= 0.13\"\n+ version: \">= 1.3\"\n description: {}\n content:\n subBlueprints:\n@@ -701,18 +701,18 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/cloudkms.cryptoKeyEncrypterDecrypter\n- - roles/iam.serviceAccountUser\n+ - roles/resourcemanager.projectIamAdmin\n+ - roles/serviceusage.serviceUsageAdmin\n - roles/storage.admin\n+ - roles/iam.serviceAccountAdmin\n+ - roles/iam.serviceAccountUser\n services:\n- - cloudkms.googleapis.com\n - cloudresourcemanager.googleapis.com\n- - compute.googleapis.com\n - iam.googleapis.com\n - serviceusage.googleapis.com\n- - storage-api.googleapis.com\n+ - storage.googleapis.com\n providerVersions:\n - source: hashicorp/google\n- version: \">= 5.43.0, < 7\"\n+ version: \">= 6.9.0, < 7\"\n - source: hashicorp/random\n version: \">= 2.1\"\n---\nmodules/simple_bucket/metadata.yaml\n@@ -28,7 +28,7 @@ spec:\n version: 11.0.0\n actuationTool:\n flavor: Terraform\n- version: \">= 0.13\"\n+ version: \">= 1.3\"\n description: {}\n content:\n examples:\n@@ -97,7 +97,7 @@ spec:\n varType: bool\n defaultValue: false\n - name: hierarchical_namespace\n- description: While set to true, hierarchical namespace is enabled for this bucket.\n+ description: When set to true, hierarchical namespace is enable for this bucket.\n varType: bool\n defaultValue: false\n - name: retention_policy\n@@ -351,16 +351,14 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/cloudkms.cryptoKeyEncrypterDecrypter\n- - roles/iam.serviceAccountUser\n - roles/storage.admin\n+ - roles/iam.serviceAccountUser\n+ - roles/cloudkms.admin\n+ - roles/logging.logWriter\n services:\n - cloudkms.googleapis.com\n- - cloudresourcemanager.googleapis.com\n- - compute.googleapis.com\n - iam.googleapis.com\n- - serviceusage.googleapis.com\n- - storage-api.googleapis.com\n+ - storage.googleapis.com\n providerVersions:\n - source: hashicorp/google\n- version: \">= 5.43.0, < 7\"\n+ version: \">= 6.9.0, < 7\"\n---\ntest/setup/iam.tf\n@@ -15,11 +15,27 @@\n */\n \n locals {\n- int_required_roles = [\n+ per_module_roles = {\n+ simple_bucket = [\n+ \"roles/storage.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ \"roles/cloudkms.admin\",\n+ \"roles/logging.logWriter\",\n+ ]\n+ root = [\n+ \"roles/resourcemanager.projectIamAdmin\",\n+ \"roles/serviceusage.serviceUsageAdmin\",\n+ \"roles/storage.admin\",\n+ \"roles/iam.serviceAccountAdmin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ]\n+ }\n+\n+ int_required_roles = concat([\n \"roles/cloudkms.cryptoKeyEncrypterDecrypter\",\n \"roles/iam.serviceAccountUser\",\n \"roles/storage.admin\",\n- ]\n+ ], flatten(values(local.per_module_roles)))\n }\n \n resource \"google_service_account\" \"int_test\" {\n---\ntest/setup/main.tf\n@@ -14,6 +14,22 @@\n * limitations under the License.\n */\n \n+locals {\n+ per_module_services = {\n+ simple_bucket = [\n+ \"storage.googleapis.com\",\n+ \"cloudkms.googleapis.com\",\n+ \"iam.googleapis.com\",\n+ ]\n+ root = [\n+ \"storage.googleapis.com\",\n+ \"iam.googleapis.com\",\n+ \"serviceusage.googleapis.com\",\n+ \"cloudresourcemanager.googleapis.com\",\n+ ]\n+ }\n+}\n+\n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n version = \"~> 18.0\"\n@@ -24,12 +40,10 @@ module \"project\" {\n folder_id = var.folder_id\n billing_account = var.billing_account\n \n- activate_apis = [\n- \"cloudkms.googleapis.com\",\n+ activate_apis = concat([\n \"cloudresourcemanager.googleapis.com\",\n \"compute.googleapis.com\",\n- \"iam.googleapis.com\",\n \"serviceusage.googleapis.com\",\n \"storage-api.googleapis.com\",\n- ]\n+ ], flatten(values(local.per_module_services)))\n }\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Cloud Storage security change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nexamples/multiple_buckets/main.tf\n@@ -28,6 +28,10 @@ module \"cloud_storage\" {\n \n prefix = \"multiple-buckets-${random_string.prefix.result}\"\n names = [\"one\", \"two\"]\n+\n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n+\n randomize_suffix = true\n \n bucket_policy_only = {\n---\nmain.tf\n@@ -44,7 +44,7 @@ resource \"google_storage_bucket\" \"buckets\" {\n project = var.project_id\n location = var.location\n = storage_class = var.storage_class\n- labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") })\n+ labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") }, { \"silly\" = var.silly_label })\n public_access_prevention = var.public_access_prevention\n \n force_destroy = lookup(\n---\ntest/integration/multiple_buckets/multiple_buckets_test.go\n@@ -46,6 +46,9 @@ func TestMultipleBuckets(t *testing.T) {\n \t\t\tgcloudArgs := gcloud.WithCommonArgs([]string{\"--project\", projectID, \"--json\"})\n \t\t\top := gcloud.Run(t, fmt.Sprintf(\"alpha storage ls --buckets gs://%s\", fullBucketName), gcloudArgs).Array()[0]\n \n+\t\t\t// verify silly label on each bucket\n+\t\t\tassert.Equal(\"awesome\", op.Get(\"metadata.labels.silly\").String(), \"should have silly label set to awesome\")\n+\n \t\t\t// verify lifecycle rules\n \t\t\tlifecycle := op.Get(\"metadata.lifecycle.rule\").Array()[0]\n \t\t\tassert.Equal(\"NEARLINE\", lifecycle.Get(\"action.storageClass\").String(), \"lifecycle action sets NEARLINE storageClass\")\n---\nvariables.tf\n@@ -30,6 +30,12 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n\nChoice B:\nexamples/multiple_buckets/main.tf\n@@ -28,6 +28,10 @@ module \"cloud_storage\" {\n \n prefix = \"multiple-buckets-${random_string.prefix.result}\"\n names = [\"one\", \"two\"]\n+\n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n+\n randomize_suffix = true\n \n bucket_policy_only = {\n---\nmain.tf\n@@ -44,7 +44,7 @@ resource \"google_storage_bucket\" \"buckets\" {\n project = var.project_id\n location = var.location\n storage_class = var.storage_class\n- labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") })\n+ labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") }, { \"silly\" = var.silly_label })\n public_access_prevention = var.public_access_prevention\n \n force_destroy = lookup(\n---\ntest/integration/multiple_buckets/multiple_buckets_test.go\n@@ -46,6 +46,9 @@ func TestMultipleBuckets(t *testing.T) {\n \t\t\tgcloudArgs := gcloud.WithCommonArgs([]string{\"--project\", projectID, \"--json\"})\n \t\t\top := gcloud.Run(t, fmt.Sprintf(\"alpha storage ls --buckets gs://%s\", fullBucketName), gcloudArgs).Array()[0]\n \n+\t\t\t// verify silly label on each bucket\n+\t\t\tassert.Equal(\"awesome\", op.Get(\"metadata.labels.silly\").String(), \"should have silly label set to awesome\")\n+\n \t\t\t// verify lifecycle rules\n \t\t\tlifecycle := op.Get(\"metadata.lifecycle.rule\").Array()[0]\n \t\t\tassert.Equal(\"NEARLINE\", lifecycle.Get(\"action.storageClass\").String(), \"lifecycle action sets NEARLINE storageClass\")\n---\nvariables.tf\n@@ -30,6 +30,12 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n\nChoice C:\nexamples/multiple_buckets/main.tf\n@@ -28,6 +28,10 @@ module \"cloud_storage\" {\n \n prefix = \"multiple-buckets-${random_string.prefix.result}\"\n names merge(var.labels, = [\"one\", \"two\"]\n+\n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n+\n randomize_suffix = true\n \n bucket_policy_only = {\n---\nmain.tf\n@@ -44,7 +44,7 @@ resource \"google_storage_bucket\" \"buckets\" {\n project = var.project_id\n location = var.location\n storage_class = var.storage_class\n- labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") })\n+ labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") }, { \"silly\" = var.silly_label })\n public_access_prevention = var.public_access_prevention\n \n force_destroy = lookup(\n---\ntest/integration/multiple_buckets/multiple_buckets_test.go\n@@ -46,6 +46,9 @@ func TestMultipleBuckets(t *testing.T) {\n \t\t\tgcloudArgs := gcloud.WithCommonArgs([]string{\"--project\", projectID, \"--json\"})\n \t\t\top := gcloud.Run(t, fmt.Sprintf(\"alpha storage ls --buckets gs://%s\", fullBucketName), gcloudArgs).Array()[0]\n \n+\t\t\t// verify silly label on each bucket\n+\t\t\tassert.Equal(\"awesome\", op.Get(\"metadata.labels.silly\").String(), \"should have silly label set to awesome\")\n+\n \t\t\t// verify lifecycle rules\n \t\t\tlifecycle := op.Get(\"metadata.lifecycle.rule\").Array()[0]\n \t\t\tassert.Equal(\"NEARLINE\", lifecycle.Get(\"action.storageClass\").String(), \"lifecycle action sets NEARLINE storageClass\")\n---\nvariables.tf\n@@ -30,6 +30,12 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n\nChoice D:\nexamples/multiple_buckets/main.tf\n@@ -28,6 +28,10 @@ module \"cloud_storage\" {\n \n prefix = \"multiple-buckets-${random_string.prefix.result}\"\n names = [\"one\", \"two\"]\n+\n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n+\n randomize_suffix = true\n \n bucket_policy_only = {\n---\nmain.tf\n@@ -44,7 +44,7 @@ resource \"google_storage_bucket\" \"buckets\" {\n project = var.project_id\n location = var.location\n storage_class = var.storage_class\n- labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") })\n+ labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") }, { \"silly\" = var.silly_label })\n public_access_prevention = var.public_access_prevention\n \n force_destroy = lookup(\n---\ntest/integration/multiple_buckets/multiple_buckets_test.go\n@@ -46,6 +46,9 @@ func TestMultipleBuckets(t *testing.T) {\n \t\t\tgcloudArgs := gcloud.WithCommonArgs([]string{\"--project\", projectID, \"--json\"})\n \t\t\top := gcloud.Run(t, fmt.Sprintf(\"alpha storage ls --buckets gs://%s\", fullBucketName), gcloudArgs).Array()[0]\n \n+\t\t\t// verify silly label on each bucket\n+\t\t\tassert.Equal(\"awesome\", op.Get(\"metadata.labels.silly\").String(), \"should have silly label set to awesome\")\n+\n \t\t\t// verify lifecycle rules\n \t\t\tlifecycle := op.Get(\"metadata.lifecycle.rule\").Array()[0]\n \t\t\tassert.Equal(\"NEARLINE\", lifecycle.Get(\"action.storageClass\").String(), \"lifecycle action sets NEARLINE storageClass\")\n---\nvariables.tf\n@@ -30,6 +30,12 @@ variable \"names\" {\n \"silly_label\" type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Cloud Storage security change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nBumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.24.0 to 0.27.0.\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/golang/oauth2/commit/681b4d8edca1bcfea5bce685d77ea7b82ed3e7b3\"><code>681b4d8</code></a> jws: split token into fixed number of parts</li>\n<li><a href=\"https://github.com/golang/oauth2/commit/3f78298beea38fb76a3fbca33e3056f4b7eb5502\"><code>3f78298</code></a> all: upgrade go directive to at least 1.23.0 [generated]</li>\n<li><a href=\"https://github.com/golang/oauth2/commit/109dabf9017129171d1807e485ca5633ecd095ac\"><code>109dabf</code></a> endpoints: add links/provider for Discord</li>\n<li><a href=\"https://github.com/golang/oauth2/commit/ac571fa341c2a2b979d2b2c8341fd24767ef5d47\"><code>ac571fa</code></a> oauth2: fix docs for Config.DeviceAuth</li>\n<li><a href=\"https://github.com/golang/oauth2/commit/314ee5b92bf23c4973aa8e61eba3ff458e80eef2\"><code>314ee5b</code></a> endpoints: add patreon endpoint</li>\n<li><a href=\"https://github.com/golang/oauth2/commit/b9c813be7d0ec3262d46deb8677ba5cda93d95ec\"><code>b9c813b</code></a> google: add warning about externally-provided credentials</li>\n<li><a href=\"https://github.com/golang/oauth2/commit/49a531d12a9ad6fa9f5a070d577ac752ada772c9\"><code>49a531d</code></a> all: make method and struct comments match the names</li>\n<li>See full diff in <a href=\"https://github.com/golang/oauth2/compare/v0.24.0...v0.27.0\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/terraform-google-modules/terraform-google-cloud-storage/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -11,32 +11,19 @@ require (\n )\n \n require (\n-\tcloud.google.com/go v0.116.0 // indirect\n-\tcloud.google.com/go/compute v1.28.3 // indirect\n-\tcloud.google.com/go/compute/metadata v0.5.2 // indirect\n-\tcloud.google.com/go/iam v1.2.2 // indirect\n-\tcloud.google.com/go/storage v1.47.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n \tgithub.com/alexflint/go-filemutex v1.3.0 // indirect\n \tgithub.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect\n-\tgithub.com/aws/aws-sdk-go v1.45.5 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n \tgithub.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect\n \tgithub.com/go-errors/errors v1.5.0 // indirect\n \tgithub.com/go-openapi/jsonpointer v0.21.0 // indirect\n \tgithub.com/go-openapi/jsonreference v0.20.2 // indirect\n \tgithub.com/go-openapi/swag v0.23.0 // indirect\n-\tgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect\n-\tgithub.com/golang/protobuf v1.5.4 // indirect\n \tgithub.com/google/gnostic-models v0.6.9 // indirect\n \tgithub.com/google/go-cmp v0.6.0 // indirect\n-\tgithub.com/google/s2a-go v0.1.8 // indirect\n-\tgithub.com/google/uuid v1.6.0 // indirect\n-\tgithub.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect\n-\tgithub.com/googleapis/gax-go/v2 v2.14.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.6 // indirect\n \tgithub.com/hashicorp/go-getter/v2 v2.2.3 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n@@ -46,7 +33,6 @@ require (\n \tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 // indirect\n \tgithub.com/hashicorp/terraform-json v0.24.0 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n-\tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n \tgithub.com/josharian/intern v1.0.0 // indirect\n \tgithub.com/klauspost/compress v1.16.7 // indirect\n \tgithub.com/mailru/easyjson v0.7.7 // indirect\n@@ -63,22 +49,13 @@ require (\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.36.0 // indirect\n \tgolang.org/x/mod v0.23.0 // indirect\n v0.0.0-20241113202542-65e8d215514f v0.38.0 // indirect\n-\tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.12.0 // indirect\n \tgolang.org/x/sys v0.31.0 // indirect\n \tgolang.org/x/text v0.23.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n-\tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n-\tgoogle.golang.org/api v0.206.0 // indirect\n-\tgoogle.golang.org/appengine v1.6.8 // indirect\n-\tgoogle.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect\n-\tgoogle.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/grpc v1.67.1 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n \tk8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -11,32 +11,19 @@ require (\n )\n \n require (\n-\tcloud.google.com/go v0.116.0 // indirect\n-\tcloud.google.com/go/compute v1.28.3 // indirect\n-\tcloud.google.com/go/compute/metadata v0.5.2 // indirect\n-\tcloud.google.com/go/iam v1.2.2 // indirect\n-\tcloud.google.com/go/storage v1.47.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n \tgithub.com/alexflint/go-filemutex v1.3.0 // indirect\n \tgithub.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect\n-\tgithub.com/aws/aws-sdk-go v1.45.5 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n \tgithub.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect\n \tgithub.com/go-errors/errors v1.5.0 // indirect\n \tgithub.com/go-openapi/jsonpointer v0.21.0 // indirect\n \tgithub.com/go-openapi/jsonreference v0.20.2 // indirect\n \tgithub.com/go-openapi/swag v0.23.0 // indirect\n-\tgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect\n-\tgithub.com/golang/protobuf v1.5.4 // indirect\n \tgithub.com/google/gnostic-models v0.6.9 // indirect\n \tgithub.com/google/go-cmp v0.6.0 // indirect\n-\tgithub.com/google/s2a-go v0.1.8 // indirect\n-\tgithub.com/google/uuid v1.6.0 // indirect\n-\tgithub.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect\n-\tgithub.com/googleapis/gax-go/v2 v2.14.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.6 // indirect\n \tgithub.com/hashicorp/go-getter/v2 v2.2.3 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n@@ -46,7 +33,6 @@ require (\n \tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 // indirect\n \tgithub.com/hashicorp/terraform-json v0.24.0 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n-\tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n \tgithub.com/josharian/intern v1.0.0 // indirect\n \tgithub.com/klauspost/compress v1.16.7 // indirect\n \tgithub.com/mailru/easyjson v0.7.7 // indirect\n@@ -63,22 +49,13 @@ require (\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.36.0 // indirect\n \tgolang.org/x/mod v0.23.0 // indirect\n \tgolang.org/x/net v0.38.0 // indirect\n-\tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.12.0 // indirect\n \tgolang.org/x/sys v0.31.0 // indirect\n \tgolang.org/x/text v0.23.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n-\tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n-\tgoogle.golang.org/api v0.206.0 // indirect\n-\tgoogle.golang.org/appengine v1.6.8 // indirect\n-\tgoogle.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect\n-\tgoogle.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/grpc v1.67.1 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n \tk8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -11,32 +11,19 @@ require (\n )\n \n require (\n-\tcloud.google.com/go v0.116.0 // indirect\n-\tcloud.google.com/go/compute v1.28.3 // indirect\n-\tcloud.google.com/go/compute/metadata v0.5.2 // indirect\n-\tcloud.google.com/go/iam v1.2.2 // indirect\n-\tcloud.google.com/go/storage v1.47.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n \tgithub.com/alexflint/go-filemutex v1.3.0 // indirect\n \tgithub.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect\n-\tgithub.com/aws/aws-sdk-go v1.45.5 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n \tgithub.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect\n \tgithub.com/go-errors/errors v1.5.0 // indirect\n \tgithub.com/go-openapi/jsonpointer v0.21.0 // indirect\n \tgithub.com/go-openapi/jsonreference v0.20.2 // indirect\n \tgithub.com/go-openapi/swag v0.23.0 // indirect\n-\tgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect\n-\tgithub.com/golang/protobuf v1.5.4 // indirect\n \tgithub.com/google/gnostic-models v0.38.0 // indirect\n \tgithub.com/google/go-cmp v0.6.0 // indirect\n-\tgithub.com/google/s2a-go v0.1.8 // indirect\n-\tgithub.com/google/uuid v1.6.0 // indirect\n-\tgithub.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect\n-\tgithub.com/googleapis/gax-go/v2 v2.14.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.6 // indirect\n \tgithub.com/hashicorp/go-getter/v2 v2.2.3 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n@@ -46,7 +33,6 @@ require (\n \tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 // indirect\n \tgithub.com/hashicorp/terraform-json v0.24.0 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n-\tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n \tgithub.com/josharian/intern v1.0.0 // indirect\n \tgithub.com/klauspost/compress v1.16.7 // indirect\n \tgithub.com/mailru/easyjson v0.7.7 // indirect\n@@ -63,22 +49,13 @@ require (\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.36.0 // indirect\n \tgolang.org/x/mod v0.23.0 // indirect\n \tgolang.org/x/net v0.38.0 // indirect\n-\tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.12.0 // indirect\n \tgolang.org/x/sys v0.31.0 // indirect\n \tgolang.org/x/text v0.23.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n-\tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n-\tgoogle.golang.org/api v0.206.0 // indirect\n-\tgoogle.golang.org/appengine v1.6.8 // indirect\n-\tgoogle.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect\n-\tgoogle.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/grpc v1.67.1 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n \tk8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -11,32 +11,19 @@ require (\n )\n \n require (\n-\tcloud.google.com/go v0.116.0 // indirect\n-\tcloud.google.com/go/compute v1.28.3 // indirect\n-\tcloud.google.com/go/compute/metadata v0.5.2 // indirect\n-\tcloud.google.com/go/iam v1.2.2 // indirect\n-\tcloud.google.com/go/storage v1.47.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n \tgithub.com/alexflint/go-filemutex v1.3.0 // indirect\n \tgithub.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect\n-\tgithub.com/aws/aws-sdk-go v1.45.5 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n \tgithub.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect\n \tgithub.com/go-errors/errors v1.5.0 // indirect\n \tgithub.com/go-openapi/jsonpointer v0.21.0 // indirect\n \tgithub.com/go-openapi/jsonreference v0.20.2 // indirect\n \tgithub.com/go-openapi/swag v0.23.0 // indirect\n-\tgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect\n-\tgithub.com/golang/protobuf v1.5.4 // indirect\n \tgithub.com/google/gnostic-models v0.6.9 // indirect\n \tgithub.com/google/go-cmp v0.6.0 // indirect\n-\tgithub.com/google/s2a-go v0.1.8 // indirect\n-\tgithub.com/google/uuid v1.6.0 // indirect\n-\tgithub.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect\n-\tgithub.com/googleapis/gax-go/v2 v2.14.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.6 // indirect\n \tgithub.com/hashicorp/go-getter/v2 v2.2.3 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n@@ -46,7 +33,6 @@ require (\n \tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 // indirect\n \tgithub.com/hashicorp/terraform-json v0.24.0 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n-\tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n \tgithub.com/josharian/intern v1.0.0 // indirect\n \tgithub.com/klauspost/compress v1.16.7 // indirect\n \tgithub.com/mailru/easyjson v0.7.7 // indirect\n@@ -63,22 +49,13 @@ require indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.36.0 // indirect\n \tgolang.org/x/mod v0.23.0 // indirect\n \tgolang.org/x/net v0.38.0 // indirect\n-\tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.12.0 // indirect\n \tgolang.org/x/sys v0.31.0 // indirect\n \tgolang.org/x/text v0.23.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n-\tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n-\tgoogle.golang.org/api v0.206.0 // indirect\n-\tgoogle.golang.org/appengine v1.6.8 // indirect\n-\tgoogle.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect\n-\tgoogle.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/grpc v1.67.1 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n \tk8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Cloud Storage security change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nREADME.md\n@@ -82,6 +82,7 @@ Functional examples are included in the\n | set\\_hmac\\_key\\_admin\\_roles | Grant roles/storage.hmacKeyAdmin role to hmac\\_key\\_admins and bucket\\_hmac\\_key\\_admins. | `bool` | `false` | no |\n | set\\_storage\\_admin\\_roles | Grant roles/storage.admin role to storage\\_admins and bucket\\_storage\\_admins. | `bool` | `false` | no |\n | set\\_viewer\\_roles | Grant roles/storage.objectViewer role to viewers and bucket\\_viewers. | `bool` | `false` | no |\n+| silly\\_label | Sample label for bucket. | `string` | n/a | yes |\n | soft\\_delete\\_policy | Soft delete policies to apply. Map of lowercase unprefixed name => soft delete policy. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | `map(any)` | `{}` | no |\n | storage\\_admins | IAM-style members who will be granted roles/storage.admin on all buckets. | `list(string)` | `[]` | no |\n | storage\\_class | Bucket storage class. | `string` | `\"STANDARD\"` | no |\n---\nexamples/multiple_buckets/main.tf\n@@ -26,8 +26,10 @@ module \"cloud_storage\" {\n \n project_id = var.project_id\n \n- prefix = \"multiple-buckets-${random_string.prefix.result}\"\n- names = [\"one\", \"two\"]\n+ prefix = \"multiple-buckets-${random_string.prefix.result}\"\n+ names = [\"one\", \"two\"]\n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n randomize_suffix = true\n \n bucket_policy_only = {\n---\nmain.tf\n@@ -44,7 +44,7 @@ resource \"google_storage_bucket\" \"buckets\" {\n project = var.project_id\n location = var.location\n storage_class = var.storage_class\n- labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") })\n+ labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") },{ \"silly\" = var.silly_label }) \n public_access_prevention = var.public_access_prevention\n \n force_destroy = lookup(\n---\ntest/integration/multiple_buckets/multiple_buckets_test.go\n@@ -46,6 +46,9 @@ func TestMultipleBuckets(t *testing.T) {\n \t\t\tgcloudArgs := gcloud.WithCommonArgs([]string{\"--project\", projectID, \"--json\"})\n \t\t\top := gcloud.Run(t, fmt.Sprintf(\"alpha storage ls --buckets gs://%s\", fullBucketName), gcloudArgs).Array()[0]\n \n+\t\t\t// verify silly label on each bucket\n+\t\t\tassert.Equal(\"awesome\", op.Get(\"metadata.labels.silly\").String(), \"should have silly label set to awesome\")\n+\n \t\t\t// verify lifecycle rules\n \t\t\tlifecycle := op.Get(\"metadata.lifecycle.rule\").Array()[0]\n \t\t\tassert.Equal(\"NEARLINE\", lifecycle.Get(\"action.storageClass\").String(), \"lifecycle action sets NEARLINE storageClass\")\n@@ -55,7 +58,7 @@ func TestMultipleBuckets(t *testing.T) {\n \n \t\t\t// peel bucket name from prefix and randomized suffix\n \t\t\tparts := strings.Split(fullBucketName, \"-\")\n-\t\t\tbucketName := parts[len(parts) - 2]\n+\t\t\tbucketName := parts[len(parts)-2]\n \n \t\t\tswitch bucketName {\n \t\t\tcase \"one\":\n---\nvariables.tf\n@@ -30,6 +30,12 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n\nChoice B:\nREADME.md\n@@ -82,6 +82,7 @@ Functional examples are included in the\n | set\\_hmac\\_key\\_admin\\_roles | Grant roles/storage.hmacKeyAdmin role to hmac\\_key\\_admins and bucket\\_hmac\\_key\\_admins. | `bool` | `false` | no |\n | set\\_storage\\_admin\\_roles | Grant roles/storage.admin role to storage\\_admins and bucket\\_storage\\_admins. | `bool` | `false` | no |\n | set\\_viewer\\_roles | Grant roles/storage.objectViewer role to viewers bucket\\_viewers. | `bool` | `false` | no |\n+| silly\\_label | Sample label for bucket. | `string` | n/a | yes |\n | soft\\_delete\\_policy | Soft delete policies to apply. Map of lowercase unprefixed name => soft delete policy. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | `map(any)` | `{}` | no |\n | storage\\_admins | IAM-style members who will be granted roles/storage.admin on all buckets. | `list(string)` | `[]` | no |\n | storage\\_class | Bucket storage class. | `string` | `\"STANDARD\"` | no |\n---\nexamples/multiple_buckets/main.tf\n@@ -26,8 +26,10 @@ module \"cloud_storage\" {\n \n project_id = var.project_id\n \n- prefix = \"multiple-buckets-${random_string.prefix.result}\"\n- names = [\"one\", \"two\"]\n+ prefix = \"multiple-buckets-${random_string.prefix.result}\"\n+ names = [\"one\", \"two\"]\n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n randomize_suffix = true\n \n bucket_policy_only = {\n---\nmain.tf\n@@ -44,7 +44,7 @@ resource \"google_storage_bucket\" \"buckets\" {\n project = var.project_id\n location = var.location\n storage_class = var.storage_class\n- labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") })\n+ labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") },{ \"silly\" = var.silly_label }) \n public_access_prevention = var.public_access_prevention\n \n force_destroy = lookup(\n---\ntest/integration/multiple_buckets/multiple_buckets_test.go\n@@ -46,6 +46,9 @@ func TestMultipleBuckets(t *testing.T) {\n \t\t\tgcloudArgs := gcloud.WithCommonArgs([]string{\"--project\", projectID, \"--json\"})\n \t\t\top := gcloud.Run(t, fmt.Sprintf(\"alpha storage ls --buckets gs://%s\", fullBucketName), gcloudArgs).Array()[0]\n \n+\t\t\t// verify silly label on each bucket\n+\t\t\tassert.Equal(\"awesome\", op.Get(\"metadata.labels.silly\").String(), \"should have silly label set to awesome\")\n+\n \t\t\t// verify lifecycle rules\n \t\t\tlifecycle := op.Get(\"metadata.lifecycle.rule\").Array()[0]\n \t\t\tassert.Equal(\"NEARLINE\", lifecycle.Get(\"action.storageClass\").String(), \"lifecycle action sets NEARLINE storageClass\")\n@@ -55,7 +58,7 @@ func TestMultipleBuckets(t *testing.T) {\n \n \t\t\t// peel bucket name from prefix and randomized suffix\n \t\t\tparts := strings.Split(fullBucketName, \"-\")\n-\t\t\tbucketName := parts[len(parts) - 2]\n+\t\t\tbucketName := parts[len(parts)-2]\n \n \t\t\tswitch bucketName {\n \t\t\tcase \"one\":\n---\nvariables.tf\n@@ -30,6 +30,12 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n\nChoice C:\nREADME.md\n@@ -82,6 +82,7 @@ Functional examples are included in the\n | set\\_hmac\\_key\\_admin\\_roles | Grant roles/storage.hmacKeyAdmin role to hmac\\_key\\_admins and bucket\\_hmac\\_key\\_admins. | `bool` | `false` | no |\n | set\\_storage\\_admin\\_roles | Grant roles/storage.admin role to storage\\_admins and bucket\\_storage\\_admins. | `bool` | `false` | no |\n | set\\_viewer\\_roles | Grant roles/storage.objectViewer role to viewers and bucket\\_viewers. | `bool` | `false` | no |\n+| silly\\_label | Sample label for bucket. | `string` | n/a | yes |\n | soft\\_delete\\_policy | Soft delete policies to apply. Map of lowercase unprefixed name => soft delete policy. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | `map(any)` | `{}` | no |\n | storage\\_admins | IAM-style members who will be granted roles/storage.admin on all buckets. | `list(string)` | `[]` | no |\n | storage\\_class | Bucket storage class. | `string` | `\"STANDARD\"` | no |\n---\nexamples/multiple_buckets/main.tf\n@@ -26,8 +26,10 @@ module \"cloud_storage\" {\n \n project_id = var.project_id\n \n- prefix = \"multiple-buckets-${random_string.prefix.result}\"\n- names = [\"one\", \"two\"]\n+ prefix = \"multiple-buckets-${random_string.prefix.result}\"\n+ names = [\"one\", \"two\"]\n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n randomize_suffix = true\n \n bucket_policy_only = {\n---\nmain.tf\n@@ -44,7 +44,7 @@ resource \"google_storage_bucket\" \"buckets\" {\n project = var.project_id\n location = var.location\n storage_class = var.storage_class\n- labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") })\n+ labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") },{ \"silly\" = var.silly_label }) \n public_access_prevention = var.public_access_prevention\n \n force_destroy = lookup(\n---\ntest/integration/multiple_buckets/multiple_buckets_test.go\n@@ -46,6 +46,9 @@ func TestMultipleBuckets(t *testing.T) {\n \t\t\tgcloudArgs := gcloud.WithCommonArgs([]string{\"--project\", projectID, \"--json\"})\n \t\t\top := gcloud.Run(t, fmt.Sprintf(\"alpha storage ls --buckets gs://%s\", fullBucketName), gcloudArgs).Array()[0]\n \n+\t\t\t// verify silly label on each bucket\n+\t\t\tassert.Equal(\"awesome\", op.Get(\"metadata.labels.silly\").String(), \"should have silly label set to awesome\")\n+\n \t\t\t// verify lifecycle rules\n \t\t\tlifecycle := op.Get(\"metadata.lifecycle.rule\").Array()[0]\n \t\t\tassert.Equal(\"NEARLINE\", lifecycle.Get(\"action.storageClass\").String(), \"lifecycle action sets NEARLINE storageClass\")\n@@ -55,7 +58,7 @@ func TestMultipleBuckets(t *testing.T) {\n \n \t\t\t// peel bucket name from prefix and randomized suffix\n \t\t\tparts := strings.Split(fullBucketName, \"-\")\n-\t\t\tbucketName := parts[len(parts) - 2]\n+\t\t\tbucketName := parts[len(parts)-2]\n \n \t\t\tswitch bucketName {\n \t\t\tcase \"one\":\n---\nvariables.tf\n@@ -30,6 +30,12 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n\nChoice D:\nREADME.md\n@@ -82,6 +82,7 @@ Functional examples are included in the\n | set\\_hmac\\_key\\_admin\\_roles | Grant roles/storage.hmacKeyAdmin role to hmac\\_key\\_admins and bucket\\_hmac\\_key\\_admins. | `bool` | `false` | no |\n | set\\_storage\\_admin\\_roles | Grant roles/storage.admin role to storage\\_admins and bucket\\_storage\\_admins. | `bool` | `false` | no |\n | set\\_viewer\\_roles | Grant roles/storage.objectViewer role to viewers and bucket\\_viewers. | `bool` | `false` | no |\n+| silly\\_label | Sample label for bucket. | `string` | n/a | yes |\n | soft\\_delete\\_policy | Soft delete policies to apply. Map of lowercase unprefixed name => soft delete policy. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | `map(any)` | `{}` | no |\n | storage\\_admins | IAM-style members who will be granted roles/storage.admin on all buckets. | `list(string)` | `[]` | no |\n | storage\\_class | Bucket storage class. | `string` | `\"STANDARD\"` | no |\n---\nexamples/multiple_buckets/main.tf\n@@ -26,8 +26,10 @@ module \"cloud_storage\" {\n \n project_id = var.project_id\n \n- prefix = \"multiple-buckets-${random_string.prefix.result}\"\n- names = [\"one\", \"two\"]\n+ prefix = \"multiple-buckets-${random_string.prefix.result}\"\n+ names = [\"one\", \"two\"]\n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n randomize_suffix = true\n \n bucket_policy_only = {\n---\nmain.tf\n@@ -44,7 +44,7 @@ resource \"google_storage_bucket\" \"buckets\" {\n project = var.project_id\n location = var.location\n storage_class = var.storage_class\n- labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") })\n+ labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") },{ \"silly\" = var.silly_label }) \n public_access_prevention = var.public_access_prevention\n \n force_destroy = lookup(\n---\ntest/integration/multiple_buckets/multiple_buckets_test.go\n@@ -46,6 +46,9 @@ func TestMultipleBuckets(t *testing.T) {\n \t\t\tgcloudArgs := gcloud.WithCommonArgs([]string{\"--project\", projectID, \"--json\"})\n \t\t\top := gcloud.Run(t, fmt.Sprintf(\"alpha storage ls --buckets gs://%s\", fullBucketName), gcloudArgs).Array()[0]\n \n+\t\t\t// verify silly label on each bucket\n+\t\t\tassert.Equal(\"awesome\", op.Get(\"metadata.labels.silly\").String(), \"should have silly label set to awesome\")\n+\n \t\t\t// verify lifecycle rules\n \t\t\tlifecycle := op.Get(\"metadata.lifecycle.rule\").Array()[0]\n \t\t\tassert.Equal(\"NEARLINE\", lifecycle.Get(\"action.storageClass\").String(), \"lifecycle action sets NEARLINE storageClass\")\n@@ -55,7 +58,7 @@ func TestMultipleBuckets(t *testing.T) {\n \n \t\t\t// peel bucket name from prefix and randomized suffix\n \t\t\tparts := strings.Split(fullBucketName, \"-\")\n-\t\t\tbucketName := parts[len(parts) - 2]\n+\t\t\tbucketName := parts[len(parts)-2]\n \n \t\t\tswitch bucketName {\n \t\t\tcase \"one\":\n---\nvariables.tf\n@@ -30,6 +30,12 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type an = bool\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Cloud Storage security change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nREADME.md\n@@ -82,6 +82,7 @@ Functional examples are included in the\n | set\\_hmac\\_key\\_admin\\_roles | Grant roles/storage.hmacKeyAdmin role to hmac\\_key\\_admins and bucket\\_hmac\\_key\\_admins. | `bool` | `false` | no |\n | set\\_storage\\_admin\\_roles | Grant roles/storage.admin role to storage\\_admins and bucket\\_storage\\_admins. | `bool` | `false` | no |\n | set\\_viewer\\_roles | Grant roles/storage.objectViewer role to viewers and bucket\\_viewers. | `bool` | `false` | no |\n+| silly\\_label | Sample label for bucket. | `string` | n/a | yes |\n | soft\\_delete\\_policy | Soft delete policies to apply. Map of lowercase unprefixed name => soft delete policy. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | `map(any)` | `{}` | no |\n | storage\\_admins | IAM-style members who will be granted roles/storage.admin on all buckets. | `list(string)` | `[]` | no |\n | storage\\_class | Bucket storage class. | `string` | `\"STANDARD\"` | no |\n---\nexamples/multiple_buckets/main.tf\n@@ -29,6 +29,8 @@ module \"cloud_storage\" {\n prefix = \"multiple-buckets-${random_string.prefix.result}\"\n names = [\"one\", \"two\"]\n randomize_suffix = true\n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n \n bucket_policy_only = {\n \"one\" = true\n---\nmain.tf\n@@ -44,7 +44,7 @@ resource \"google_storage_bucket\" \"buckets\" {\n project = var.project_id\n location = var.location\n storage_class = var.storage_class\n- labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") })\n+ labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") },{ \"silly\" = var.silly_label })\n public_access_prevention = var.public_access_prevention\n \n force_destroy = lookup(\n---\ntest/integration/multiple_buckets/multiple_buckets_test.go\n@@ -34,6 +34,7 @@ var retryErrors = map[string]string{\n }\n \n func TestMultipleBuckets(t *testing.T) {\n+\n \tbuckets := tft.NewTFBlueprintTest(t, tft.WithRetryableTerraformErrors(retryErrors, 5, time.Minute))\n \n \tbuckets.DefineVerify(func(assert *assert.Assertions) {\n@@ -46,6 +47,8 @@ func TestMultipleBuckets(t *testing.T) {\n \t\t\tgcloudArgs := gcloud.WithCommonArgs([]string{\"--project\", projectID, \"--json\"})\n \t\t\top := gcloud.Run(t, fmt.Sprintf(\"alpha storage ls --buckets gs://%s\", fullBucketName), gcloudArgs).Array()[0]\n \n+\t\t\tassert.Equal(\"awesome\", op.Get(\"metadata.labels.silly\").String(), \"should have silly label set to awesome\")\n+\n \t\t\t// verify lifecycle rules\n \t\t\tlifecycle := op.Get(\"metadata.lifecycle.rule\").Array()[0]\n \t\t\tassert.Equal(\"NEARLINE\", lifecycle.Get(\"action.storageClass\").String(), \"lifecycle action sets NEARLINE storageClass\")\n@@ -55,7 +58,7 @@ func TestMultipleBuckets(t *testing.T) {\n \n \t\t\t// peel bucket name from prefix and randomized suffix\n \t\t\tparts := strings.Split(fullBucketName, \"-\")\n-\t\t\tbucketName := parts[len(parts) - 2]\n+\t\t\tbucketName := parts[len(parts)-2]\n \n \t\t\tswitch bucketName {\n \t\t\tcase \"one\":\n---\ntest/setup/iam.tf\n@@ -24,8 +24,8 @@ locals {\n \n resource \"google_service_account\" \"int_test\" {\n project = module.project.project_id\n- account_id = \"ci-cloud-storage\"\n- display_name = \"ci-cloud-storage\"\n+ account_id = \"terrafrom-modules-cli\"\n+ display_name = \"terrafrom-modules-cli\"\n }\n \n resource \"google_project_iam_member\" \"int_test\" {\n---\ntest/setup/main.tf\n@@ -18,7 +18,7 @@ module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n version = \"~> 18.0\"\n \n- name = \"ci-cloud-storage\"\n+ name = \"terrafrom-modules-cli\"\n random_project_id = \"true\"\n org_id = var.org_id\n folder_id = var.folder_id\n---\nvariables.tf\n@@ -30,6 +30,12 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n\nChoice B:\nREADME.md\n@@ -82,6 +82,7 @@ Functional examples are included in the\n | set\\_hmac\\_key\\_admin\\_roles | Grant roles/storage.hmacKeyAdmin role to hmac\\_key\\_admins and bucket\\_hmac\\_key\\_admins. | `bool` | `false` | no |\n | set\\_storage\\_admin\\_roles | Grant roles/storage.admin role to storage\\_admins bucket\\_storage\\_admins. | `bool` | `false` | no |\n | set\\_viewer\\_roles | Grant roles/storage.objectViewer role to viewers and bucket\\_viewers. | `bool` | `false` | no |\n+| silly\\_label | Sample label for bucket. | `string` | n/a | yes |\n | soft\\_delete\\_policy | Soft delete policies to apply. Map of lowercase unprefixed name => soft delete policy. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | `map(any)` | `{}` | no |\n | storage\\_admins | IAM-style members who will be granted roles/storage.admin on all buckets. | `list(string)` | `[]` | no |\n | storage\\_class | Bucket storage class. | `string` | `\"STANDARD\"` | no |\n---\nexamples/multiple_buckets/main.tf\n@@ -29,6 +29,8 @@ module \"cloud_storage\" {\n prefix = \"multiple-buckets-${random_string.prefix.result}\"\n names = [\"one\", \"two\"]\n randomize_suffix = true\n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n \n bucket_policy_only = {\n \"one\" = true\n---\nmain.tf\n@@ -44,7 +44,7 @@ resource \"google_storage_bucket\" \"buckets\" {\n project = var.project_id\n location = var.location\n storage_class = var.storage_class\n- labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") })\n+ labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") },{ \"silly\" = var.silly_label })\n public_access_prevention = var.public_access_prevention\n \n force_destroy = lookup(\n---\ntest/integration/multiple_buckets/multiple_buckets_test.go\n@@ -34,6 +34,7 @@ var retryErrors = map[string]string{\n }\n \n func TestMultipleBuckets(t *testing.T) {\n+\n \tbuckets := tft.NewTFBlueprintTest(t, tft.WithRetryableTerraformErrors(retryErrors, 5, time.Minute))\n \n \tbuckets.DefineVerify(func(assert *assert.Assertions) {\n@@ -46,6 +47,8 @@ func TestMultipleBuckets(t *testing.T) {\n \t\t\tgcloudArgs := gcloud.WithCommonArgs([]string{\"--project\", projectID, \"--json\"})\n \t\t\top := gcloud.Run(t, fmt.Sprintf(\"alpha storage ls --buckets gs://%s\", fullBucketName), gcloudArgs).Array()[0]\n \n+\t\t\tassert.Equal(\"awesome\", op.Get(\"metadata.labels.silly\").String(), \"should have silly label set to awesome\")\n+\n \t\t\t// verify lifecycle rules\n \t\t\tlifecycle := op.Get(\"metadata.lifecycle.rule\").Array()[0]\n \t\t\tassert.Equal(\"NEARLINE\", lifecycle.Get(\"action.storageClass\").String(), \"lifecycle action sets NEARLINE storageClass\")\n@@ -55,7 +58,7 @@ func TestMultipleBuckets(t *testing.T) {\n \n \t\t\t// peel bucket name from prefix and randomized suffix\n \t\t\tparts := strings.Split(fullBucketName, \"-\")\n-\t\t\tbucketName := parts[len(parts) - 2]\n+\t\t\tbucketName := parts[len(parts)-2]\n \n \t\t\tswitch bucketName {\n \t\t\tcase \"one\":\n---\ntest/setup/iam.tf\n@@ -24,8 +24,8 @@ locals {\n \n resource \"google_service_account\" \"int_test\" {\n project = module.project.project_id\n- account_id = \"ci-cloud-storage\"\n- display_name = \"ci-cloud-storage\"\n+ account_id = \"terrafrom-modules-cli\"\n+ display_name = \"terrafrom-modules-cli\"\n }\n \n resource \"google_project_iam_member\" \"int_test\" {\n---\ntest/setup/main.tf\n@@ -18,7 +18,7 @@ module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n version = \"~> 18.0\"\n \n- name = \"ci-cloud-storage\"\n+ name = \"terrafrom-modules-cli\"\n random_project_id = \"true\"\n org_id = var.org_id\n folder_id = var.folder_id\n---\nvariables.tf\n@@ -30,6 +30,12 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n\nChoice C:\nREADME.md\n@@ -82,6 +82,7 @@ Functional examples are included in the\n | set\\_hmac\\_key\\_admin\\_roles | Grant roles/storage.hmacKeyAdmin role to hmac\\_key\\_admins and bucket\\_hmac\\_key\\_admins. | `bool` | `false` | no |\n | set\\_storage\\_admin\\_roles | Grant roles/storage.admin role to storage\\_admins and bucket\\_storage\\_admins. | `bool` | `false` | no |\n | set\\_viewer\\_roles | Grant roles/storage.objectViewer role to viewers and bucket\\_viewers. | `bool` | `false` | no |\n+| silly\\_label | Sample label for bucket. | `string` | n/a | yes |\n | soft\\_delete\\_policy | Soft delete policies to apply. Map of lowercase unprefixed name => soft delete policy. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | `map(any)` | `{}` | no |\n | storage\\_admins | IAM-style members who will be granted roles/storage.admin on all buckets. | `list(string)` | `[]` | no |\n | storage\\_class | Bucket storage class. | `string` | `\"STANDARD\"` | no |\n---\nexamples/multiple_buckets/main.tf\n@@ -29,6 +29,8 @@ module \"cloud_storage\" {\n prefix = \"multiple-buckets-${random_string.prefix.result}\"\n names = [\"one\", \"two\"]\n randomize_suffix = true\n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n \n bucket_policy_only = {\n \"one\" = true\n---\nmain.tf\n@@ -44,7 +44,7 @@ resource \"google_storage_bucket\" \"buckets\" {\n project = var.project_id\n location = var.location\n storage_class = var.storage_class\n- labels Format = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") })\n+ labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") },{ \"silly\" = var.silly_label })\n public_access_prevention = var.public_access_prevention\n \n force_destroy = lookup(\n---\ntest/integration/multiple_buckets/multiple_buckets_test.go\n@@ -34,6 +34,7 @@ var retryErrors = map[string]string{\n }\n \n func TestMultipleBuckets(t *testing.T) {\n+\n \tbuckets := tft.NewTFBlueprintTest(t, tft.WithRetryableTerraformErrors(retryErrors, 5, time.Minute))\n \n \tbuckets.DefineVerify(func(assert *assert.Assertions) {\n@@ -46,6 +47,8 @@ func TestMultipleBuckets(t *testing.T) {\n \t\t\tgcloudArgs := gcloud.WithCommonArgs([]string{\"--project\", projectID, \"--json\"})\n \t\t\top := gcloud.Run(t, fmt.Sprintf(\"alpha storage ls --buckets gs://%s\", fullBucketName), gcloudArgs).Array()[0]\n \n+\t\t\tassert.Equal(\"awesome\", op.Get(\"metadata.labels.silly\").String(), \"should have silly label set to awesome\")\n+\n \t\t\t// verify lifecycle rules\n \t\t\tlifecycle := op.Get(\"metadata.lifecycle.rule\").Array()[0]\n \t\t\tassert.Equal(\"NEARLINE\", lifecycle.Get(\"action.storageClass\").String(), \"lifecycle action sets NEARLINE storageClass\")\n@@ -55,7 +58,7 @@ func TestMultipleBuckets(t *testing.T) {\n \n \t\t\t// peel bucket name from prefix and randomized suffix\n \t\t\tparts := strings.Split(fullBucketName, \"-\")\n-\t\t\tbucketName := parts[len(parts) - 2]\n+\t\t\tbucketName := parts[len(parts)-2]\n \n \t\t\tswitch bucketName {\n \t\t\tcase \"one\":\n---\ntest/setup/iam.tf\n@@ -24,8 +24,8 @@ locals {\n \n resource \"google_service_account\" \"int_test\" {\n project = module.project.project_id\n- account_id = \"ci-cloud-storage\"\n- display_name = \"ci-cloud-storage\"\n+ account_id = \"terrafrom-modules-cli\"\n+ display_name = \"terrafrom-modules-cli\"\n }\n \n resource \"google_project_iam_member\" \"int_test\" {\n---\ntest/setup/main.tf\n@@ -18,7 +18,7 @@ module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n version = \"~> 18.0\"\n \n- name = \"ci-cloud-storage\"\n+ name = \"terrafrom-modules-cli\"\n random_project_id = \"true\"\n org_id = var.org_id\n folder_id = var.folder_id\n---\nvariables.tf\n@@ -30,6 +30,12 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n\nChoice D:\nREADME.md\n@@ -82,6 +82,7 @@ Functional examples are included in the\n | set\\_hmac\\_key\\_admin\\_roles | Grant roles/storage.hmacKeyAdmin role to hmac\\_key\\_admins and bucket\\_hmac\\_key\\_admins. | `bool` | `false` | no |\n | set\\_storage\\_admin\\_roles | Grant roles/storage.admin role to storage\\_admins and bucket\\_storage\\_admins. | `bool` | `false` | no |\n | set\\_viewer\\_roles | Grant roles/storage.objectViewer role to viewers and bucket\\_viewers. | `bool` | `false` | no |\n+| silly\\_label | Sample label for bucket. | `string` | n/a | yes |\n | soft\\_delete\\_policy | Soft delete policies to apply. Map of lowercase unprefixed name => soft delete policy. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | `map(any)` | `{}` | no |\n | storage\\_admins | IAM-style members who will be granted roles/storage.admin on all buckets. | `list(string)` | `[]` | no |\n | storage\\_class | Bucket storage class. | `string` | `\"STANDARD\"` | no |\n---\nexamples/multiple_buckets/main.tf\n@@ -29,6 +29,8 @@ module \"cloud_storage\" {\n prefix = \"multiple-buckets-${random_string.prefix.result}\"\n names = [\"one\", \"two\"]\n randomize_suffix = true\n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n \n bucket_policy_only = {\n \"one\" = true\n---\nmain.tf\n@@ -44,7 +44,7 @@ resource \"google_storage_bucket\" \"buckets\" {\n project = var.project_id\n location = var.location\n storage_class = var.storage_class\n- labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") })\n+ labels = merge(var.labels, { name = replace(join(\"-\", compact([var.prefix, each.value])), \".\", \"-\") },{ \"silly\" = var.silly_label })\n public_access_prevention = var.public_access_prevention\n \n force_destroy = lookup(\n---\ntest/integration/multiple_buckets/multiple_buckets_test.go\n@@ -34,6 +34,7 @@ var retryErrors = map[string]string{\n }\n \n func TestMultipleBuckets(t *testing.T) {\n+\n \tbuckets := tft.NewTFBlueprintTest(t, tft.WithRetryableTerraformErrors(retryErrors, 5, time.Minute))\n \n \tbuckets.DefineVerify(func(assert *assert.Assertions) {\n@@ -46,6 +47,8 @@ func TestMultipleBuckets(t *testing.T) {\n \t\t\tgcloudArgs := gcloud.WithCommonArgs([]string{\"--project\", projectID, \"--json\"})\n \t\t\top := gcloud.Run(t, fmt.Sprintf(\"alpha storage ls --buckets gs://%s\", fullBucketName), gcloudArgs).Array()[0]\n \n+\t\t\tassert.Equal(\"awesome\", op.Get(\"metadata.labels.silly\").String(), \"should have silly label set to awesome\")\n+\n \t\t\t// verify lifecycle rules\n \t\t\tlifecycle := op.Get(\"metadata.lifecycle.rule\").Array()[0]\n \t\t\tassert.Equal(\"NEARLINE\", lifecycle.Get(\"action.storageClass\").String(), \"lifecycle action sets NEARLINE storageClass\")\n@@ -55,7 +58,7 @@ func TestMultipleBuckets(t *testing.T) {\n \n \t\t\t// peel bucket name from prefix and randomized suffix\n \t\t\tparts := strings.Split(fullBucketName, \"-\")\n-\t\t\tbucketName := parts[len(parts) - 2]\n+\t\t\tbucketName := parts[len(parts)-2]\n \n \t\t\tswitch bucketName {\n \t\t\tcase \"one\":\n---\ntest/setup/iam.tf\n@@ -24,8 +24,8 @@ locals {\n \n resource \"google_service_account\" \"int_test\" {\n project = module.project.project_id\n- account_id = \"ci-cloud-storage\"\n- display_name = \"ci-cloud-storage\"\n+ account_id = \"terrafrom-modules-cli\"\n+ display_name = \"terrafrom-modules-cli\"\n }\n \n resource \"google_project_iam_member\" \"int_test\" {\n---\ntest/setup/main.tf\n@@ -18,7 +18,7 @@ module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n version = \"~> 18.0\"\n \n- name = \"ci-cloud-storage\"\n+ name = \"terrafrom-modules-cli\"\n random_project_id = \"true\"\n org_id = var.org_id\n folder_id = var.folder_id\n---\nvariables.tf\n@@ -30,6 +30,12 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Cloud Storage security change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nmain.tf\n@@ -75,6 +75,11 @@ resource \"google_storage_bucket\" \"buckets\" {\n lower(each.value),\n false,\n )\n+ terminal_storage_class = lookup(\n+ var.terminal_autoclass,\n+ lower(each.value),\n+ \"NEARLINE\"\n+ )\n }\n hierarchical_namespace {\n enabled enable lookup(\n---\nmodules/simple_bucket/main.tf\n@@ -35,6 +35,7 @@ resource \"google_storage_bucket\" \"bucket\" {\n \n autoclass {\n enabled = var.autoclass\n+ terminal_storage_class = var.terminal_autoclass\n }\n \n hierarchical_namespace {\n---\nmodules/simple_bucket/variables.tf\n@@ -75,6 +75,16 @@ variable \"autoclass\" {\n default = false\n }\n \n+variable \"terminal_autoclass\" {\n+ description = \"The storage class that objects in the bucket eventually transition to if they are not read for a certain length of time. Supported values include: NEARLINE, ARCHIVE. Only used if autoclass is set as true\"\n+ type = string\n+ default = \"NEARLINE\"\n+ validation {\n+ condition = var.autoclass == false || var.terminal_autoclass == \"NEARLINE\" || var.terminal_autoclass == \"ARCHIVE\"\n+ error_message = \"Acceptable value for terminal_autoclass is NEARLINE or ARCHIVE\"\n+ }\n+}\n+\n variable \"hierarchical_namespace\" {\n description = \"When set to true, hierarchical namespace is enable for this bucket.\"\n type = bool\n---\nvariables.tf\n@@ -66,6 +66,16 @@ variable \"autoclass\" {\n default = {}\n }\n \n+variable \"terminal_autoclass\" {\n+ description = \"Optional map of storage class that objects in the bucket eventually transitions to. Supported values include: NEARLINE, ARCHIVE. Only used if autoclass is set as true. bucket_name => value, defaults to NEARLINE\"\n+ type = map(string)\n+ default = {}\n+ validation {\n+ condition = alltrue([ for _, v in var.terminal_autoclass : var.autoclass == false || v == \"NEARLINE\" || v == \"ARCHIVE\"])\n+ error_message = \"Acceptable value for terminal_autoclass is NEARLINE or ARCHIVE\"\n+ }\n+}\n+\n variable \"hierarchical_namespace\" {\n description = \"Optional map of lowercase unprefixed bucket name => boolean, defaults to false.\"\n type = map(bool)\n---\n\n\n---\n\nChoice B:\nmain.tf\n@@ -75,6 +75,11 @@ resource \"google_storage_bucket\" \"buckets\" {\n lower(each.value),\n false,\n )\n+ terminal_storage_class = lookup(\n+ var.terminal_autoclass,\n+ lower(each.value),\n+ \"NEARLINE\"\n+ )\n }\n hierarchical_namespace {\n enabled = lookup(\n---\nmodules/simple_bucket/main.tf\n@@ -35,6 +35,7 @@ resource \"google_storage_bucket\" \"bucket\" {\n \n autoclass {\n enabled = var.autoclass\n+ terminal_storage_class = var.terminal_autoclass\n }\n \n hierarchical_namespace {\n---\nmodules/simple_bucket/variables.tf\n@@ -75,6 +75,16 @@ variable \"autoclass\" {\n default = false\n }\n \n+variable \"terminal_autoclass\" {\n+ description = \"The storage class that objects in the bucket eventually transition to if they are not read for a certain length of time. Supported values include: NEARLINE, ARCHIVE. Only used if autoclass is set as true\"\n+ type = string\n+ default = \"NEARLINE\"\n+ validation {\n+ condition = var.autoclass == false || var.terminal_autoclass == \"NEARLINE\" || var.terminal_autoclass == \"ARCHIVE\"\n+ error_message = \"Acceptable value for terminal_autoclass is NEARLINE or ARCHIVE\"\n+ }\n+}\n+\n variable \"hierarchical_namespace\" {\n description = \"When set to true, hierarchical namespace is enable for this bucket.\"\n type = bool\n---\nvariables.tf\n@@ -66,6 +66,16 @@ variable \"autoclass\" {\n default = {}\n }\n \n+variable \"terminal_autoclass\" {\n+ description = \"Optional map of storage class that objects in the bucket eventually transitions to. Supported values include: NEARLINE, ARCHIVE. Only used if autoclass is set as true. bucket_name => value, defaults to NEARLINE\"\n+ type = map(string)\n+ default = {}\n+ validation {\n+ condition = alltrue([ for _, v in var.terminal_autoclass : var.autoclass == false || v == \"NEARLINE\" || v == \"ARCHIVE\"])\n+ error_message = \"Acceptable value for terminal_autoclass is NEARLINE or ARCHIVE\"\n+ }\n+}\n+\n variable \"hierarchical_namespace\" {\n description = \"Optional map of lowercase unprefixed bucket name => boolean, defaults to false.\"\n type = map(bool)\n---\n\n\n---\n\nChoice C:\nmain.tf\n@@ -75,6 +75,11 @@ resource \"google_storage_bucket\" \"buckets\" {\n lower(each.value),\n false,\n )\n+ terminal_storage_class = lookup(\n+ var.terminal_autoclass,\n+ lower(each.value),\n+ \"NEARLINE\"\n+ )\n }\n hierarchical_namespace {\n enabled = lookup(\n---\nmodules/simple_bucket/main.tf\n@@ -35,6 +35,7 @@ resource \"google_storage_bucket\" \"bucket\" {\n \n autoclass {\n enabled = var.autoclass\n+ terminal_storage_class = var.terminal_autoclass\n }\n \n hierarchical_namespace {\n---\nmodules/simple_bucket/variables.tf\n@@ -75,6 +75,16 @@ variable \"autoclass\" {\n default = false\n }\n \n+variable \"terminal_autoclass\" {\n+ description = \"The storage class that objects in the bucket eventually is to if they are not read for a certain length of time. Supported values include: NEARLINE, ARCHIVE. Only used if autoclass is set as true\"\n+ type = string\n+ default = \"NEARLINE\"\n+ validation {\n+ condition = var.autoclass == false || var.terminal_autoclass == \"NEARLINE\" || var.terminal_autoclass == \"ARCHIVE\"\n+ error_message = \"Acceptable value for terminal_autoclass is NEARLINE or ARCHIVE\"\n+ }\n+}\n+\n variable \"hierarchical_namespace\" {\n description = \"When set to true, hierarchical namespace is enable for this bucket.\"\n type = bool\n---\nvariables.tf\n@@ -66,6 +66,16 @@ variable \"autoclass\" {\n default = {}\n }\n \n+variable \"terminal_autoclass\" {\n+ description = \"Optional map of storage class that objects in the bucket eventually transitions to. Supported values include: NEARLINE, ARCHIVE. Only used if autoclass is set as true. bucket_name => value, defaults to NEARLINE\"\n+ type = map(string)\n+ default = {}\n+ validation {\n+ condition = alltrue([ for _, v in var.terminal_autoclass : var.autoclass == false || v == \"NEARLINE\" || v == \"ARCHIVE\"])\n+ error_message = \"Acceptable value for terminal_autoclass is NEARLINE or ARCHIVE\"\n+ }\n+}\n+\n variable \"hierarchical_namespace\" {\n description = \"Optional map of lowercase unprefixed bucket name => boolean, defaults to false.\"\n type = map(bool)\n---\n\n\n---\n\nChoice D:\nmain.tf\n@@ -75,6 +75,11 @@ resource \"google_storage_bucket\" \"buckets\" lower(each.value),\n false,\n )\n+ terminal_storage_class = lookup(\n+ var.terminal_autoclass,\n+ lower(each.value),\n+ \"NEARLINE\"\n+ )\n }\n hierarchical_namespace {\n enabled = lookup(\n---\nmodules/simple_bucket/main.tf\n@@ -35,6 +35,7 @@ resource \"google_storage_bucket\" \"bucket\" {\n \n autoclass {\n enabled = var.autoclass\n+ terminal_storage_class = var.terminal_autoclass\n }\n \n hierarchical_namespace {\n---\nmodules/simple_bucket/variables.tf\n@@ -75,6 +75,16 @@ variable \"autoclass\" {\n default = false\n }\n \n+variable \"terminal_autoclass\" {\n+ description = \"The storage class that objects in the bucket eventually transition to if they are not read for a certain length of time. Supported values include: NEARLINE, ARCHIVE. Only used if autoclass is set as true\"\n+ type = string\n+ default = \"NEARLINE\"\n+ validation {\n+ condition = var.autoclass == false || var.terminal_autoclass == \"NEARLINE\" || var.terminal_autoclass == \"ARCHIVE\"\n+ error_message = \"Acceptable value for terminal_autoclass is NEARLINE or ARCHIVE\"\n+ }\n+}\n+\n variable \"hierarchical_namespace\" {\n description = \"When set to true, hierarchical namespace is enable for this bucket.\"\n type = bool\n---\nvariables.tf\n@@ -66,6 +66,16 @@ variable \"autoclass\" {\n default = {}\n }\n \n+variable \"terminal_autoclass\" {\n+ description = \"Optional map of storage class that objects in the bucket eventually transitions to. Supported values include: NEARLINE, ARCHIVE. Only used if autoclass is set as true. bucket_name => value, defaults to NEARLINE\"\n+ type = map(string)\n+ default = {}\n+ validation {\n+ condition = alltrue([ for _, v in var.terminal_autoclass : var.autoclass == false || v == \"NEARLINE\" || v == \"ARCHIVE\"])\n+ error_message = \"Acceptable value for terminal_autoclass is NEARLINE or ARCHIVE\"\n+ }\n+}\n+\n variable \"hierarchical_namespace\" {\n description = \"Optional map of lowercase unprefixed bucket name => boolean, defaults to false.\"\n type = map(bool)\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Cloud Storage security change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nREADME.md\n@@ -82,6 +82,7 @@ Functional examples are included in the\n | set\\_hmac\\_key\\_admin\\_roles | Grant roles/storage.hmacKeyAdmin role to hmac\\_key\\_admins and bucket\\_hmac\\_key\\_admins. | `bool` | `false` | no |\n | set\\_storage\\_admin\\_roles | Grant roles/storage.admin role to storage\\_admins and bucket\\_storage\\_admins. | `bool` | `false` | no |\n | set\\_viewer\\_roles | Grant roles/storage.objectViewer role to viewers and bucket\\_viewers. | `bool` | `false` | no |\n+| silly\\_label | Sample label for bucket. | `string` | n/a | yes |\n | soft\\_delete\\_policy | Soft delete policies to apply. Map of lowercase unprefixed name => soft delete policy. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | `map(any)` | `{}` | no |\n | storage\\_admins | IAM-style members who will be granted roles/storage.admin on all buckets. | `list(string)` | `[]` | no |\n | storage\\_class | Bucket storage class. | `string` | `\"STANDARD\"` | no |\n---\nexamples/multiple_buckets/main.tf\n@@ -24,6 +24,9 @@ module \"cloud_storage\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n version = \"~> 10.0\"\n \n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n+\n project_id = var.project_id\n \n prefix = \"multiple-buckets-${random_string.prefix.result}\"\n---\nmain.tf\n@@ -24,7 +24,8 @@ resource \"random_id\" \"bucket_suffix\" {\n \n locals {\n suffix = var.randomize_suffix ? random_id.bucket_suffix[0].hex : \"\"\n- names_set = toset(var.names)\n+ // CODELAB:Add silly label in labels variable\n+ labels = merge(var.labels, { name = replace(\"${local.prefix}${lower(element(var.names, count.index))}\", \".\", \"-\") }, { \"silly\" = var.silly_label })\n buckets_list = [for name in var.names : google_storage_bucket.buckets[name]]\n first_bucket = local.buckets_list[0]\n folder_list = flatten([\n---\ntest/integration/multiple_buckets/controls/gsutils.rb\n@@ -0,0 +1,29 @@\n+control \"gsutil\" do\n+ <..>\n+\n+# CODELAB: Copy paste the below test in gsutil.rb to test silly_label feature.\n+\n+# command to get the labels for bucket_1\n+describe command(\"gsutil label get gs://#{attribute(\"names_list\")[0]}\") do\n+ //check if the command gave a valid response\n+ its(:exit_status) { should eq 0 }\n+ its(:stderr) { should eq \"\" }\n+\n+ //parse the command's output into JSON\n+ let!(:data) do\n+ if subject.exit_status == 0\n+ JSON.parse(subject.stdout)\n+ else\n+ {}\n+ end\n+ end\n+\n+ # check if bucket_1 has the new \"silly\" label with the value \"awesome\"\n+ describe \"bucket_1\" do\n+ it \"has label\" do\n+ data.each do |bucket|\n+ expect(data[\"silly\"]).to include(\"awesome\")\n+ end\n+ end\n+ end\n+ end\n---\nvariables.tf\n@@ -30,6 +30,16 @@ variable \"names\" {\n type describe list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+variable \"location\" {\n+ description = \"Bucket location.\"\n+ default = \"EU\"\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n\nChoice B:\nREADME.md\n@@ -82,6 +82,7 @@ Functional examples are included in the\n | set\\_hmac\\_key\\_admin\\_roles | Grant roles/storage.hmacKeyAdmin role to hmac\\_key\\_admins and bucket\\_hmac\\_key\\_admins. | `bool` | `false` | no |\n | set\\_storage\\_admin\\_roles | Grant roles/storage.admin role to storage\\_admins and bucket\\_storage\\_admins. | `bool` | `false` | no |\n | set\\_viewer\\_roles | Grant roles/storage.objectViewer role to viewers and bucket\\_viewers. | `bool` | `false` | no |\n+| silly\\_label | Sample label for bucket. | `string` | n/a | yes |\n | soft\\_delete\\_policy | Soft delete policies to apply. Map of lowercase unprefixed name => soft delete policy. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | `map(any)` | `{}` | no |\n | storage\\_admins | IAM-style members who will be granted roles/storage.admin on all buckets. | `list(string)` | `[]` | no |\n | storage\\_class | Bucket storage class. | `string` | `\"STANDARD\"` | no |\n---\nexamples/multiple_buckets/main.tf\n@@ -24,6 +24,9 @@ module \"cloud_storage\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n version = \"~> 10.0\"\n \n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n+\n project_id = var.project_id\n \n prefix = \"multiple-buckets-${random_string.prefix.result}\"\n---\nmain.tf\n@@ -24,7 +24,8 @@ resource \"random_id\" \"bucket_suffix\" {\n \n locals {\n suffix = var.randomize_suffix ? random_id.bucket_suffix[0].hex : \"\"\n- names_set = toset(var.names)\n+ // CODELAB:Add silly label in labels variable\n+ labels = merge(var.labels, { name = replace(\"${local.prefix}${lower(element(var.names, count.index))}\", \".\", \"-\") }, { \"silly\" = var.silly_label })\n buckets_list = [for name in var.names : google_storage_bucket.buckets[name]]\n first_bucket = local.buckets_list[0]\n folder_list = flatten([\n---\ntest/integration/multiple_buckets/controls/gsutils.rb\n@@ -0,0 +1,29 @@\n+control \"gsutil\" do\n+ <..>\n+\n+# CODELAB: Copy paste the below test in gsutil.rb to test silly_label feature.\n+\n+# command to get the labels for bucket_1\n+describe command(\"gsutil label get gs://#{attribute(\"names_list\")[0]}\") do\n+ //check if the command gave a valid response\n+ its(:exit_status) { should eq 0 }\n+ its(:stderr) { should eq \"\" }\n+\n+ //parse the command's output into JSON\n+ let!(:data) do\n+ if subject.exit_status == 0\n+ JSON.parse(subject.stdout)\n+ else\n+ {}\n+ end\n+ end\n+\n+ # check if bucket_1 has the new \"silly\" label with the value \"awesome\"\n+ describe \"bucket_1\" do\n+ it \"has label\" do\n+ data.each do |bucket|\n+ expect(data[\"silly\"]).to include(\"awesome\")\n+ end\n+ end\n+ end\n+ end\n---\nvariables.tf\n@@ -30,6 +30,16 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+variable \"location\" {\n+ description = \"Bucket location.\"\n+ default = \"EU\"\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n\nChoice C:\nREADME.md\n@@ -82,6 +82,7 @@ Functional examples are included in the\n | set\\_hmac\\_key\\_admin\\_roles | Grant roles/storage.hmacKeyAdmin role to hmac\\_key\\_admins and bucket\\_hmac\\_key\\_admins. | `bool` | `false` | no |\n | set\\_storage\\_admin\\_roles | Grant roles/storage.admin role to storage\\_admins and bucket\\_storage\\_admins. | `bool` | `false` | no |\n | set\\_viewer\\_roles | Grant roles/storage.objectViewer role to viewers and bucket\\_viewers. | `bool` | `false` | no |\n+| silly\\_label | Sample label for bucket. | `string` | n/a | yes |\n | soft\\_delete\\_policy | Soft delete policies to apply. Map of lowercase unprefixed name => soft delete policy. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | `map(any)` | `{}` | no |\n | storage\\_admins | IAM-style members who will be granted roles/storage.admin on all buckets. | `list(string)` | `[]` | no |\n | storage\\_class | Bucket storage class. | `string` | `\"STANDARD\"` | no |\n---\nexamples/multiple_buckets/main.tf\n@@ -24,6 +24,9 @@ module \"cloud_storage\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n version = \"~> 10.0\"\n \n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n+\n project_id = var.project_id\n \n prefix = \"multiple-buckets-${random_string.prefix.result}\"\n---\nmain.tf\n@@ -24,7 +24,8 @@ resource \"random_id\" \"bucket_suffix\" {\n \n locals {\n suffix = var.randomize_suffix ? random_id.bucket_suffix[0].hex : \"\"\n- names_set = toset(var.names)\n+ // CODELAB:Add silly label in labels variable\n+ labels = merge(var.labels, { name = replace(\"${local.prefix}${lower(element(var.names, count.index))}\", \".\", \"-\") }, { \"silly\" = var.silly_label })\n buckets_list = [for name in var.names : google_storage_bucket.buckets[name]]\n first_bucket = local.buckets_list[0]\n folder_list = flatten([\n---\ntest/integration/multiple_buckets/controls/gsutils.rb\n@@ -0,0 +1,29 @@\n+control \"gsutil\" do\n+ <..>\n+\n+# CODELAB: Copy paste the below test in gsutil.rb delete test silly_label feature.\n+\n+# command to get the labels for bucket_1\n+describe command(\"gsutil label get gs://#{attribute(\"names_list\")[0]}\") do\n+ //check if the command gave a valid response\n+ its(:exit_status) { should eq 0 }\n+ its(:stderr) { should eq \"\" }\n+\n+ //parse the command's output into JSON\n+ let!(:data) do\n+ if subject.exit_status == 0\n+ JSON.parse(subject.stdout)\n+ else\n+ {}\n+ end\n+ end\n+\n+ # check if bucket_1 has the new \"silly\" label with the value \"awesome\"\n+ describe \"bucket_1\" do\n+ it \"has label\" do\n+ data.each do |bucket|\n+ expect(data[\"silly\"]).to include(\"awesome\")\n+ end\n+ end\n+ end\n+ end\n---\nvariables.tf\n@@ -30,6 +30,16 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+variable \"location\" {\n+ description = \"Bucket location.\"\n+ default = \"EU\"\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n\nChoice D:\nREADME.md\n@@ -82,6 +82,7 @@ Functional examples are included in the\n | set\\_hmac\\_key\\_admin\\_roles | Grant roles/storage.hmacKeyAdmin role to hmac\\_key\\_admins and bucket\\_hmac\\_key\\_admins. | `bool` | `false` | no |\n | set\\_storage\\_admin\\_roles | Grant roles/storage.admin role to storage\\_admins and bucket\\_storage\\_admins. | `bool` | `false` | no |\n | set\\_viewer\\_roles | Grant roles/storage.objectViewer role to viewers and bucket\\_viewers. | `bool` | `false` | no |\n+| silly\\_label | Sample label for bucket. | `string` | n/a | yes |\n | soft\\_delete\\_policy | Soft delete policies to apply. Map of lowercase unprefixed name => soft delete policy. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | `map(any)` | `{}` | no |\n | storage\\_admins | IAM-style members who will be granted roles/storage.admin on all buckets. | `list(string)` | `[]` | no |\n | storage\\_class | Bucket storage class. | `string` | `\"STANDARD\"` | no |\n---\nexamples/multiple_buckets/main.tf\n@@ -24,6 +24,9 @@ module \"cloud_storage\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n version = \"~> 10.0\"\n \n+ // CODELAB: Add \"silly_label\" as an example to main.tf.\n+ silly_label = \"awesome\"\n+\n project_id = var.project_id\n \n prefix = \"multiple-buckets-${random_string.prefix.result}\"\n---\nmain.tf\n@@ -24,7 +24,8 @@ resource \"random_id\" \"bucket_suffix\" {\n \n locals {\n suffix = var.randomize_suffix ? random_id.bucket_suffix[0].hex : \"\"\n- names_set = toset(var.names)\n+ // CODELAB:Add silly label in labels variable\n+ labels = merge(var.labels, { name = replace(\"${local.prefix}${lower(element(var.names, count.index))}\", \".\", \"-\") }, { \"silly\" = var.silly_label })\n buckets_list = [for name in var.names : google_storage_bucket.buckets[name]]\n first_bucket = local.buckets_list[0]\n folder_list = flatten([\n---\ntest/integration/multiple_buckets/controls/gsutils.rb\n@@ -0,0 +1,29 @@\n+control \"gsutil\" do\n+ <..>\n+\n+# CODELAB: Copy paste the below test in gsutil.rb to test silly_label feature.\n+\n+# command to get the labels for bucket_1\n+describe command(\"gsutil label get gs://#{attribute(\"names_list\")[0]}\") do\n+ //check if the command gave a valid response\n+ its(:exit_status) { should eq 0 }\n+ its(:stderr) { should eq \"\" }\n+\n+ //parse the command's output into JSON\n+ let!(:data) do\n+ if subject.exit_status == 0\n+ JSON.parse(subject.stdout)\n+ else\n+ {}\n+ end\n+ end\n+\n+ # check if bucket_1 has the new \"silly\" label with the value \"awesome\"\n+ describe \"bucket_1\" do\n+ it \"has label\" do\n+ data.each do |bucket|\n+ expect(data[\"silly\"]).to include(\"awesome\")\n+ end\n+\n+ end\n+ end\n+ end\n+ end\n---\nvariables.tf\n@@ -30,6 +30,16 @@ variable \"names\" {\n type = list(string)\n }\n \n+// CODELAB: Add \"silly_label\" variable to variables.tf between \"names\" and \"location\"\n+variable \"silly_label\" {\n+ description = \"Sample label for bucket.\"\n+ type = string\n+}\n+variable \"location\" {\n+ description = \"Bucket location.\"\n+ default = \"EU\"\n+}\n+\n variable \"randomize_suffix\" {\n description = \"Adds an identical, but randomized 4-character suffix to all bucket names\"\n type = bool\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Cloud Storage security change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n:robot: I have created a release *beep* *boop*\n---\n\n\n## [11.0.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.2...v11.0.0) (2025-05-30)\n\n\n### ⚠ BREAKING CHANGES\n\n* **tf>=1.3:** bump TF to >=1.3 ([#367](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/367))\n* add hierarchical namespace flag ([#375](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/375))\n\n### Features\n\n* add hierarchical namespace flag ([#375](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/375)) ([b65e3eb](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/b65e3ebf1c4df261355afb57e63fbd033cb8ea36))\n\n\n### Bug Fixes\n\n* **tf>=1.3:** bump TF to >=1.3 ([#367](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/367)) ([b5b0362](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/b5b036297c8761b05a60aaeb21dd822f4e360e36))\n\n---\nThis PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).\n\n---\n\nChoice A:\nCHANGELOG.md\n@@ -7,6 +7,23 @@ The format is based on\n and this project adheres to\n [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n \n+## [11.0.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.2...v11.0.0) (2025-05-30)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* **tf>=1.3:** bump TF to >=1.3 ([#367](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/367))\n+* add hierarchical namespace flag ([#375](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/375))\n+\n+### Features\n+\n+* add hierarchical namespace flag ([#375](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/375)) ([b65e3eb](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/b65e3ebf1c4df261355afb57e63fbd033cb8ea36))\n+\n+\n+### Bug Fixes\n+\n+* **tf>=1.3:** bump TF to >=1.3 ([#367](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/367)) ([b5b0362](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/b5b036297c8761b05a60aaeb21dd822f4e360e36))\n+\n ## [10.0.2](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.1...v10.0.2) (2025-05-19)\n \n \n---\nREADME.md\n@@ -24,7 +24,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"gcs_buckets\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n project_id = \"<PROJECT ID>\"\n names = [\"first\", \"second\"]\n prefix = \"my-unique-prefix\"\n---\nmetadata.yaml\n@@ -24,7 +24,7 @@ spec:\n source:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n- version: 10.0.2\n+ version: 11.0.0\n actuationTool:\n flavor: Terraform\n version: \">= 0.13\"\n---\nmodules/simple_bucket/README.md\n@@ -18,7 +18,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"bucket\" {\n source = \"terraform-google-modules/cloud-storage/google//modules/simple_bucket\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n name = \"example-bucket\"\n project_id = \"example-project\"\n---\nmodules/simple_bucket/metadata.yaml\n@@ -25,7 +25,7 @@ spec:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n dir: /modules/simple_bucket\n- version: 10.0.2\n+ version: 11.0.0\n actuationTool:\n flavor: Terraform\n version: \">= 0.13\"\n---\nmodules/simple_bucket/versions.tf\n@@ -25,7 +25,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v10.0.2\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v11.0.0\"\n }\n \n }\n---\nversions.tf\n@@ -30,7 +30,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage/v10.0.2\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage/v11.0.0\"\n }\n \n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -7,6 +7,23 @@ The format is based on\n and this project adheres to\n [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n \n+## [11.0.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.2...v11.0.0) (2025-05-30)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* **tf>=1.3:** bump TF to >=1.3 ([#367](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/367))\n+* add hierarchical namespace flag ([#375](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/375))\n+\n+### Features\n+\n+* add hierarchical namespace flag ([#375](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/375)) ([b65e3eb](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/b65e3ebf1c4df261355afb57e63fbd033cb8ea36))\n+\n+\n+### Bug Fixes\n+\n+* **tf>=1.3:** bump TF to >=1.3 ([#367](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/367)) ([b5b0362](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/b5b036297c8761b05a60aaeb21dd822f4e360e36))\n+\n ## [10.0.2](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.1...v10.0.2) (2025-05-19)\n \n \n---\nREADME.md\n@@ -24,7 +24,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"gcs_buckets\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n project_id = \"<PROJECT ID>\"\n names = [\"first\", \"second\"]\n prefix = \"my-unique-prefix\"\n---\nmetadata.yaml\n@@ -24,7 +24,7 @@ spec:\n source:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n- version: 10.0.2\n+ version: 11.0.0\n actuationTool:\n flavor: Terraform\n version: \">= 0.13\"\n---\nmodules/simple_bucket/README.md\n@@ -18,7 +18,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"bucket\" {\n source = \"terraform-google-modules/cloud-storage/google//modules/simple_bucket\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n name = \"example-bucket\"\n project_id = \"example-project\"\n---\nmodules/simple_bucket/metadata.yaml\n@@ -25,7 +25,7 @@ spec:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n dir: /modules/simple_bucket\n- version: 10.0.2\n+ version: 11.0.0\n actuationTool:\n flavor: Terraform\n version: \">= 0.13\"\n---\nmodules/simple_bucket/versions.tf\n@@ -25,7 +25,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v10.0.2\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v11.0.0\"\n }\n \n }\n---\nversions.tf\n@@ -30,7 +30,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage/v10.0.2\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage/v11.0.0\"\n }\n \n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -7,6 +7,23 @@ The format version: based on\n and this project adheres to\n [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n \n+## [11.0.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.2...v11.0.0) (2025-05-30)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* **tf>=1.3:** bump TF to >=1.3 ([#367](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/367))\n+* add hierarchical namespace flag ([#375](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/375))\n+\n+### Features\n+\n+* add hierarchical namespace flag ([#375](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/375)) ([b65e3eb](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/b65e3ebf1c4df261355afb57e63fbd033cb8ea36))\n+\n+\n+### Bug Fixes\n+\n+* **tf>=1.3:** bump TF to >=1.3 ([#367](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/367)) ([b5b0362](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/b5b036297c8761b05a60aaeb21dd822f4e360e36))\n+\n ## [10.0.2](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.1...v10.0.2) (2025-05-19)\n \n \n---\nREADME.md\n@@ -24,7 +24,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"gcs_buckets\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n project_id = \"<PROJECT ID>\"\n names = [\"first\", \"second\"]\n prefix = \"my-unique-prefix\"\n---\nmetadata.yaml\n@@ -24,7 +24,7 @@ spec:\n source:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n- version: 10.0.2\n+ version: 11.0.0\n actuationTool:\n flavor: Terraform\n version: \">= 0.13\"\n---\nmodules/simple_bucket/README.md\n@@ -18,7 +18,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"bucket\" {\n source = \"terraform-google-modules/cloud-storage/google//modules/simple_bucket\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n name = \"example-bucket\"\n project_id = \"example-project\"\n---\nmodules/simple_bucket/metadata.yaml\n@@ -25,7 +25,7 @@ spec:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n dir: /modules/simple_bucket\n- version: 10.0.2\n+ version: 11.0.0\n actuationTool:\n flavor: Terraform\n version: \">= 0.13\"\n---\nmodules/simple_bucket/versions.tf\n@@ -25,7 +25,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v10.0.2\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v11.0.0\"\n }\n \n }\n---\nversions.tf\n@@ -30,7 +30,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage/v10.0.2\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage/v11.0.0\"\n }\n \n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -7,6 +7,23 @@ The format is based on\n and this project adheres to\n [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n \n+## [11.0.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.2...v11.0.0) (2025-05-30)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* **tf>=1.3:** bump TF to >=1.3 ([#367](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/367))\n+* add hierarchical namespace flag ([#375](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/375))\n+\n+### Features\n+\n+* add hierarchical namespace flag ([#375](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/375)) ([b65e3eb](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/b65e3ebf1c4df261355afb57e63fbd033cb8ea36))\n+\n+\n+### Bug Fixes\n+\n+* **tf>=1.3:** bump TF to >=1.3 ([#367](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/367)) ([b5b0362](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/b5b036297c8761b05a60aaeb21dd822f4e360e36))\n+\n ## [10.0.2](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.1...v10.0.2) (2025-05-19)\n \n \n---\nREADME.md\n@@ -24,7 +24,7 @@ Basic usage of this module is as follows:\n ```hcl\n \"gcs_buckets\" {\n source = \"terraform-google-modules/cloud-storage/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n project_id = \"<PROJECT ID>\"\n names = [\"first\", \"second\"]\n prefix = \"my-unique-prefix\"\n---\nmetadata.yaml\n@@ -24,7 +24,7 @@ spec:\n source:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n- version: 10.0.2\n+ version: 11.0.0\n actuationTool:\n flavor: Terraform\n version: \">= 0.13\"\n---\nmodules/simple_bucket/README.md\n@@ -18,7 +18,7 @@ Basic usage of this module is as follows:\n ```hcl\n module \"bucket\" {\n source = \"terraform-google-modules/cloud-storage/google//modules/simple_bucket\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n name = \"example-bucket\"\n project_id = \"example-project\"\n---\nmodules/simple_bucket/metadata.yaml\n@@ -25,7 +25,7 @@ spec:\n repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git\n sourceType: git\n dir: /modules/simple_bucket\n- version: 10.0.2\n+ version: 11.0.0\n actuationTool:\n flavor: Terraform\n version: \">= 0.13\"\n---\nmodules/simple_bucket/versions.tf\n@@ -25,7 +25,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v10.0.2\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v11.0.0\"\n }\n \n }\n---\nversions.tf\n@@ -30,7 +30,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-cloud-storage/v10.0.2\"\n+ module_name = \"blueprints/terraform/terraform-google-cloud-storage/v11.0.0\"\n }\n \n }\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Cloud Storage security change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nBumps [golang.org/x/net](https://github.com/golang/net) from 0.25.0 to 0.38.0.\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/golang/net/commit/e1fcd82abba34df74614020343be8eb1fe85f0d9\"><code>e1fcd82</code></a> html: properly handle trailing solidus in unquoted attribute value in foreign...</li>\n<li><a href=\"https://github.com/golang/net/commit/ebed060e8f30f20235f74808c22125fd86b15edd\"><code>ebed060</code></a> internal/http3: fix build of tests with GOEXPERIMENT=nosynctest</li>\n<li><a href=\"https://github.com/golang/net/commit/1f1fa29e0a46fffe18c43a9da8daa5a0b180dfa9\"><code>1f1fa29</code></a> publicsuffix: regenerate table</li>\n<li><a href=\"https://github.com/golang/net/commit/12150816f701c912a32a376754ab28dd3878833a\"><code>1215081</code></a> http2: improve error when server sends HTTP/1</li>\n<li><a href=\"https://github.com/golang/net/commit/312450e473eae9f9e6173ad895c80bc5ea2f79ad\"><code>312450e</code></a> html: ensure <search> tag closes <p> and update tests</li>\n<li><a href=\"https://github.com/golang/net/commit/09731f9bf919b00b344c763894cd1920b3d96d90\"><code>09731f9</code></a> http2: improve handling of lost PING in Server</li>\n<li><a href=\"https://github.com/golang/net/commit/55989e24b972a90ab99308fdc7ea1fb58a96fef1\"><code>55989e2</code></a> http2/h2c: use ResponseController for hijacking connections</li>\n<li><a href=\"https://github.com/golang/net/commit/2914f46773171f4fa13e276df1135bafef677801\"><code>2914f46</code></a> websocket: re-recommend gorilla/websocket</li>\n<li><a href=\"https://github.com/golang/net/commit/99b3ae0643f9a2f9d820fcbba5f9e4c83b23bd48\"><code>99b3ae0</code></a> go.mod: update golang.org/x dependencies</li>\n<li><a href=\"https://github.com/golang/net/commit/85d1d54551b68719346cb9fec24b911da4e452a1\"><code>85d1d54</code></a> go.mod: update golang.org/x dependencies</li>\n<li>Additional commits viewable in <a href=\"https://github.com/golang/net/compare/v0.25.0...v0.38.0\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nYou can trigger a rebase of this PR by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/terraform-google-modules/terraform-google-cloud-storage/network/alerts).\n\n</details>\n\n> **Note**\n> Automatic rebases have been disabled on this pull request as it has been open for over 30 days.\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -1,8 +1,7 @@\n module github.com/terraform-google-modules/terraform-google-cloud-storage/test/integration\n \n go 1.22.0\n-\n-toolchain go1.22.8\n+toolchain go1.24.1\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n@@ -62,13 +61,13 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.4 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.31.0 // indirect\n+\tgolang.org/x/crypto v0.36.0 // indirect\n \tgolang.org/x/mod v0.21.0 // indirect\n-\tgolang.org/x/net v0.25.0 // indirect\n+\tgolang.org/x/net v0.38.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n-\tgolang.org/x/sync v0.10.0 // indirect\n-\tgolang.org/x/sys v0.28.0 // indirect\n-\tgolang.org/x/text v0.21.0 // indirect\n+\tgolang.org/x/sync v0.12.0 // indirect\n+\tgolang.org/x/sys v0.31.0 // indirect\n+\tgolang.org/x/text v0.23.0 // indirect\n \tgolang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n---\ntest/integration/go.sum\n@@ -481,8 +481,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U\n golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=\n golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=\n-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=\n+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=\n+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=\n golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=\n@@ -568,8 +568,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug\n golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=\n-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=\n-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=\n+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=\n+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=\n golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=\n golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n@@ -611,8 +611,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ\n golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=\n-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=\n+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=\n+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=\n golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n@@ -677,13 +677,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc\n golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=\n-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=\n+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n@@ h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=\n-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=\n+golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=\n+golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=\n golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n@@ -695,8 +695,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=\n golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=\n golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=\n-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=\n+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=\n+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=\n golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -1,8 +1,7 @@\n module github.com/terraform-google-modules/terraform-google-cloud-storage/test/integration\n \n go 1.22.0\n-\n-toolchain go1.22.8\n+toolchain go1.24.1\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n@@ -62,13 +61,13 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.4 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.31.0 // indirect\n+\tgolang.org/x/crypto v0.36.0 // indirect\n \tgolang.org/x/mod v0.21.0 // indirect\n-\tgolang.org/x/net v0.25.0 // indirect\n+\tgolang.org/x/net v0.38.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n-\tgolang.org/x/sync v0.10.0 // indirect\n-\tgolang.org/x/sys v0.28.0 // indirect\n-\tgolang.org/x/text v0.21.0 // indirect\n+\tgolang.org/x/sync v0.12.0 // indirect\n+\tgolang.org/x/sys v0.31.0 // indirect\n+\tgolang.org/x/text v0.23.0 // indirect\n \tgolang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n---\ntest/integration/go.sum\n@@ -481,8 +481,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U\n golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=\n golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=\n-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=\n+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=\n+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=\n golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=\n@@ -568,8 +568,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug\n golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=\n-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=\n-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=\n+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=\n+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=\n golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=\n golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n@@ -611,8 +611,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ\n golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=\n-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=\n+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=\n+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=\n golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n@@ -677,13 +677,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc\n golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=\n-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=\n+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=\n-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=\n+golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=\n+golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=\n golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n@@ -695,8 +695,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=\n golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=\n golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=\n-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=\n+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=\n+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=\n golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -1,8 +1,7 @@\n module github.com/terraform-google-modules/terraform-google-cloud-storage/test/integration\n \n go 1.22.0\n-\n-toolchain go1.22.8\n+toolchain go1.24.1\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n@@ -62,13 +61,13 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.4 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.31.0 // indirect\n+\tgolang.org/x/crypto v0.36.0 // indirect\n \tgolang.org/x/mod v0.21.0 // indirect\n-\tgolang.org/x/net v0.25.0 // indirect\n+\tgolang.org/x/net v0.38.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n-\tgolang.org/x/sync v0.10.0 // indirect\n-\tgolang.org/x/sys v0.28.0 // indirect\n-\tgolang.org/x/text v0.21.0 // indirect\n+\tgolang.org/x/sync v0.12.0 // indirect\n+\tgolang.org/x/sys v0.31.0 // indirect\n+\tgolang.org/x/text v0.23.0 // indirect\n \tgolang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n---\ntest/integration/go.sum\n@@ -481,8 +481,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U\n golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=\n golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=\n-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=\n+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=\n+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=\n golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=\n@@ -568,8 +568,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug\n golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=\n-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=\n-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=\n+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=\n+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=\n golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=\n golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n@@ -611,8 +611,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ\n golang.org/x/sync h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=\n h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=\n-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=\n+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=\n+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=\n golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n@@ -677,13 +677,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc\n golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=\n-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=\n+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=\n-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=\n+golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=\n+golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=\n golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n@@ -695,8 +695,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=\n golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=\n golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=\n-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=\n+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=\n+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=\n golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -1,8 +1,7 @@\n module github.com/terraform-google-modules/terraform-google-cloud-storage/test/integration\n \n go 1.22.0\n-\n-toolchain go1.22.8\n+toolchain go1.24.1\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n@@ -62,13 +61,13 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.4 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.31.0 // indirect\n+\tgolang.org/x/crypto v0.36.0 // indirect\n \tgolang.org/x/mod v0.21.0 // indirect\n-\tgolang.org/x/net v0.25.0 // indirect\n+\tgolang.org/x/net v0.38.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n-\tgolang.org/x/sync v0.10.0 // indirect\n-\tgolang.org/x/sys v0.28.0 // indirect\n-\tgolang.org/x/text \tgithub.com/zclconf/go-cty // indirect\n+\tgolang.org/x/sync v0.12.0 // indirect\n+\tgolang.org/x/sys v0.31.0 // indirect\n+\tgolang.org/x/text v0.23.0 // indirect\n \tgolang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n---\ntest/integration/go.sum\n@@ -481,8 +481,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U\n golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=\n golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=\n-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=\n+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=\n+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=\n golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=\n@@ -568,8 +568,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug\n golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=\n-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=\n-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=\n+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=\n+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=\n golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=\n golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n@@ -611,8 +611,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ\n golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=\n-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=\n+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=\n+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=\n golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n@@ -677,13 +677,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc\n golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=\n-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=\n+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=\n-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=\n+golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=\n+golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=\n golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n@@ -695,8 +695,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=\n golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=\n golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=\n-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=\n+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=\n+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=\n golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n---\n\n\n---\n"
}
] |
B
|
End of preview. Expand
in Data Studio
No dataset card yet
- Downloads last month
- 33