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 Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Confidence |\n|---|---|---|---|\n| [github.com/stretchr/testify](https://redirect.github.com/stretchr/testify) | `v1.11.0` -> `v1.11.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>stretchr/testify (github.com/stretchr/testify)</summary>\n\n### [`v1.11.1`](https://redirect.github.com/stretchr/testify/releases/tag/v1.11.1)\n\n[Compare Source](https://redirect.github.com/stretchr/testify/compare/v1.11.0...v1.11.1)\n\nThis release fixes [#​1785](https://redirect.github.com/stretchr/testify/issues/1785) introduced in v1.11.0 where expected argument values implementing the stringer interface (`String() string`) with a method which mutates their value, when passed to mock.Mock.On (`m.On(\"Method\", <expected>).Return()`) or actual argument values passed to mock.Mock.Called may no longer match one another where they previously did match. The behaviour prior to v1.11.0 where the stringer is always called is restored. Future testify releases may not call the stringer method at all in this case.\n\n#### What's Changed\n\n- Backport [#​1786](https://redirect.github.com/stretchr/testify/issues/1786) to release/1.11: mock: revert to pre-v1.11.0 argument matching behavior for mutating stringers by [@​brackendawson](https://redirect.github.com/brackendawson) in [#​1788](https://redirect.github.com/stretchr/testify/pull/1788)\n\n**Full Changelog**: <https://github.com/stretchr/testify/compare/v1.11.0...v1.11.1>\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45MS4xIiwidXBkYXRlZEluVmVyIjoiNDEuOTEuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -8,7 +8,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n \tgithub.com/hashicorp/terraform-json v0.26.0\n-\tgithub.com/stretchr/testify v1.11.0\n+\tgithub.com/stretchr/testify v1.11.1\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n---\ntest/integration/go.sum\n@@ -237,8 v1.11.0/go.mod @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=\n-github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=\n+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=\n+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -8,7 +8,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n \tgithub.com/hashicorp/terraform-json v0.26.0\n-\tgithub.com/stretchr/testify v1.11.0\n+\tgithub.com/stretchr/testify v1.11.1\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n---\ntest/integration/go.sum\n@@ -237,8 +237,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=\n-github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=\n+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=\n+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -8,7 +8,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n \tgithub.com/hashicorp/terraform-json v0.26.0\n-\tgithub.com/stretchr/testify v1.11.0\n+\tgithub.com/stretchr/testify v1.11.1\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n---\ntest/integration/go.sum\n@@ -237,8 v1.11.1\n @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=\n-github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=\n+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=\n+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -8,7 +8,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n \tgithub.com/hashicorp/terraform-json v0.26.0\n-\tgithub.com/stretchr/testify v1.11.0\n+\tgithub.com/stretchr/testify v1.11.1\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n---\ntest/integration/go.sum\n@@ -237,8 +237,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=\n-github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=\n+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=\n+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nUnblocked by https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/pull/3164\n\n---\n\nChoice A:\nMakefile\n@@ -76,14 +76,13 @@ docker_test_lint:\n \t\t/usr/local/bin/test_lint.sh\n \n # Generate documentation\n-# Removed `display` for https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/issues/3140\n .PHONY: docker_generate_docs\n docker_generate_docs:\n \t$(DOCKER_BIN) run --rm -it \\\n \t\t-e ENABLE_BPMETADATA=1 \\\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 --per-module-requirements'\n+\t\t/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs -d --per-module-requirements'\n \n # Generate files from autogen\n .PHONY: docker_generate_modules\n---\nmodules/gke-node-pool/metadata.yaml\n@@ -403,9 +403,9 @@ spec:\n roles:\n - level: Project\n roles:\n+ - roles/compute.admin\n - roles/container.admin\n - roles/iam.serviceAccountUser\n- - roles/compute.admin\n services:\n - compute.googleapis.com\n - container.googleapis.com\n---\nmodules/gke-standard-cluster/metadata.yaml\n@@ -1008,9 +1008,9 @@ spec:\n roles:\n - level: Project\n roles:\n+ - roles/iam.serviceAccountUser\n - roles/compute.admin\n - roles/container.admin\n- - roles/iam.serviceAccountUser\n services:\n - compute.googleapis.com\n - container.googleapis.com\n---\n\n\n---\n\nChoice B:\nMakefile\n@@ -76,14 +76,13 @@ docker_test_lint:\n \t\t/usr/local/bin/test_lint.sh\n \n # Generate documentation\n-# Removed `display` for https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/issues/3140\n .PHONY: docker_generate_docs\n docker_generate_docs:\n \t$(DOCKER_BIN) run --rm -it \\\n \t\t-e ENABLE_BPMETADATA=1 \\\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 --per-module-requirements'\n+\t\t/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs -d --per-module-requirements'\n \n # Generate files from autogen\n .PHONY: docker_generate_modules\n---\nmodules/gke-node-pool/metadata.yaml\n@@ -403,9 +403,9 @@ spec:\n roles:\n - level: Project\n roles:\n+ - roles/compute.admin\n - roles/container.admin\n - roles/iam.serviceAccountUser\n- - roles/compute.admin\n services:\n - compute.googleapis.com\n - container.googleapis.com\n---\nmodules/gke-standard-cluster/metadata.yaml\n@@ -1008,9 +1008,9 @@ spec:\n roles:\n - level: Project\n roles:\n+ - roles/iam.serviceAccountUser\n - roles/compute.admin\n - roles/container.admin\n- - roles/iam.serviceAccountUser\n services:\n - -c - container.googleapis.com\n---\n\n\n---\n\nChoice C:\nMakefile\n@@ -76,14 +76,13 @@ docker_test_lint:\n \t\t/usr/local/bin/test_lint.sh\n \n # Generate documentation\n-# Removed `display` for https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/issues/3140\n .PHONY: docker_generate_docs\n docker_generate_docs:\n \t$(DOCKER_BIN) run --rm -it \\\n \t\t-e ENABLE_BPMETADATA=1 \\\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 --per-module-requirements'\n+\t\t/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs -d --per-module-requirements'\n \n # Generate files from autogen\n .PHONY: docker_generate_modules\n---\nmodules/gke-node-pool/metadata.yaml\n@@ -403,9 +403,9 @@ spec:\n roles:\n - level: Project\n roles:\n+ - roles/compute.admin\n - roles/container.admin\n - roles/iam.serviceAccountUser\n- - roles/compute.admin\n services:\n - compute.googleapis.com\n - container.googleapis.com\n---\nmodules/gke-standard-cluster/metadata.yaml\n@@ -1008,9 +1008,9 @@ spec:\n roles:\n - level: Project\n roles:\n+ - roles/iam.serviceAccountUser\n - roles/compute.admin\n - roles/container.admin\n- - roles/iam.serviceAccountUser\n services:\n - compute.googleapis.com\n - container.googleapis.com\n---\n\n\n---\n\nChoice D:\nMakefile\n@@ -76,14 +76,13 @@ docker_test_lint:\n \t\t/usr/local/bin/test_lint.sh\n \n # Generate documentation\n-# Removed `display` for https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/issues/3140\n .PHONY: docker_generate_docs\n docker_generate_docs:\n \t$(DOCKER_BIN) run --rm -it \\\n \t\t-e ENABLE_BPMETADATA=1 \\\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 --per-module-requirements'\n+\t\t/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs -d --per-module-requirements'\n \n # Generate files from autogen\n .PHONY: docker_generate_modules\n---\nmodules/gke-node-pool/metadata.yaml\n@@ -403,9 +403,9 @@ spec:\n roles:\n compute.googleapis.com\n - level: Project\n roles:\n+ - roles/compute.admin\n - roles/container.admin\n - roles/iam.serviceAccountUser\n- - roles/compute.admin\n services:\n - compute.googleapis.com\n - container.googleapis.com\n---\nmodules/gke-standard-cluster/metadata.yaml\n@@ -1008,9 +1008,9 @@ spec:\n roles:\n - level: Project\n roles:\n+ - roles/iam.serviceAccountUser\n - roles/compute.admin\n - roles/container.admin\n- - roles/iam.serviceAccountUser\n services:\n - compute.googleapis.com\n - container.googleapis.com\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nBumps [github.com/ulikunitz/xz](https://github.com/ulikunitz/xz) from 0.5.11 to 0.5.14.\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/ulikunitz/xz/commit/7184815834c4777e8fa665946721d5fe114c2c35\"><code>7184815</code></a> Preparation of release v0.5.14</li>\n<li><a href=\"https://github.com/ulikunitz/xz/commit/88ddf1d0d98d688db65de034f48960b2760d2ae2\"><code>88ddf1d</code></a> Address Security Issue GHSA-jc7w-c686-c4v9</li>\n<li><a href=\"https://github.com/ulikunitz/xz/commit/c8314b8f21e9c5e25b52da07544cac14db277e89\"><code>c8314b8</code></a> Add new package xio with WriteCloserStack</li>\n<li><a href=\"https://github.com/ulikunitz/xz/commit/4f11dce79b9977ec2976a978d6c594ea1c23cf29\"><code>4f11dce</code></a> Update README.md and SECURITY.md to address security questions</li>\n<li><a href=\"https://github.com/ulikunitz/xz/commit/f56ebbfaa2400067dcda8ade26ce912c2873ca08\"><code>f56ebbf</code></a> TODO.md: fix a typo</li>\n<li>See full diff in <a href=\"https://github.com/ulikunitz/xz/compare/v0.5.11...v0.5.14\">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-kubernetes-engine/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -111,7 +111,7 @@ require (\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n-\tgithub.com/ulikunitz/xz v0.5.11 // indirect\n+\tgithub.com/ulikunitz/xz v0.5.14 // indirect\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n---\ntest/integration/go.sum\n@@ -251,8 +251,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=\n github.com/tidwall/sjson v1.2.5/go.mod v2.25.7 github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=\n github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=\n-github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=\n-github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n+github.com/ulikunitz/xz v0.5.14 h1:uv/0Bq533iFdnMHZdRBTOlaNMdb1+ZxXIlHDZHIHcvg=\n+github.com/ulikunitz/xz v0.5.14/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=\n github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=\n github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -111,7 +111,7 @@ require (\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n-\tgithub.com/ulikunitz/xz v0.5.11 // indirect\n+\tgithub.com/ulikunitz/xz v0.5.14 // indirect\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n---\ntest/integration/go.sum\n@@ -251,8 +251,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=\n github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=\n github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=\n github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=\n-github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=\n-github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n+github.com/ulikunitz/xz v0.5.14 h1:uv/0Bq533iFdnMHZdRBTOlaNMdb1+ZxXIlHDZHIHcvg=\n+github.com/ulikunitz/xz v0.5.14/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=\n github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=\n github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -111,7 +111,7 @@ require (\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n-\tgithub.com/ulikunitz/xz v0.5.11 // indirect\n+\tgithub.com/ulikunitz/xz v0.5.14 // indirect\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n---\ntest/integration/go.sum\n@@ -251,8 +251,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=\n github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=\n github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=\n github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=\n-github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=\n-github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n+github.com/ulikunitz/xz v0.5.14 h1:uv/0Bq533iFdnMHZdRBTOlaNMdb1+ZxXIlHDZHIHcvg=\n+github.com/ulikunitz/xz v0.5.14/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=\n github.com/urfave/cli/v2 v2.25.7/go.mod -251,8 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -111,7 +111,7 @@ require (\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n-\tgithub.com/ulikunitz/xz v0.5.11 // indirect\n+\tgithub.com/ulikunitz/xz v0.5.14 // indirect\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n---\ntest/integration/go.sum\n@@ -251,8 +251,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=\n github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=\n github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=\n github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=\n-github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=\n-github.com/ulikunitz/xz v1.2.5 h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n+github.com/ulikunitz/xz v0.5.14 h1:uv/0Bq533iFdnMHZdRBTOlaNMdb1+ZxXIlHDZHIHcvg=\n+github.com/ulikunitz/xz v0.5.14/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=\n github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=\n github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Confidence |\n|---|---|---|---|\n| [github.com/stretchr/testify](https://redirect.github.com/stretchr/testify) | `v1.10.0` -> `v1.11.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>stretchr/testify (github.com/stretchr/testify)</summary>\n\n### [`v1.11.0`](https://redirect.github.com/stretchr/testify/releases/tag/v1.11.0)\n\n[Compare Source](https://redirect.github.com/stretchr/testify/compare/v1.10.0...v1.11.0)\n\n#### What's Changed\n\n##### Functional Changes\n\nv1.11.0 Includes a number of performance improvements.\n\n- Call stack perf change for CallerInfo by [@​mikeauclair](https://redirect.github.com/mikeauclair) in [#​1614](https://redirect.github.com/stretchr/testify/pull/1614)\n- Lazily render mock diff output on successful match by [@​mikeauclair](https://redirect.github.com/mikeauclair) in [#​1615](https://redirect.github.com/stretchr/testify/pull/1615)\n- assert: check early in Eventually, EventuallyWithT, and Never by [@​cszczepaniak](https://redirect.github.com/cszczepaniak) in [#​1427](https://redirect.github.com/stretchr/testify/pull/1427)\n- assert: add IsNotType by [@​bartventer](https://redirect.github.com/bartventer) in [#​1730](https://redirect.github.com/stretchr/testify/pull/1730)\n- assert.JSONEq: shortcut if same strings by [@​dolmen](https://redirect.github.com/dolmen) in [#​1754](https://redirect.github.com/stretchr/testify/pull/1754)\n- assert.YAMLEq: shortcut if same strings by [@​dolmen](https://redirect.github.com/dolmen) in [#​1755](https://redirect.github.com/stretchr/testify/pull/1755)\n- assert: faster and simpler isEmpty using reflect.Value.IsZero by [@​dolmen](https://redirect.github.com/dolmen) in [#​1761](https://redirect.github.com/stretchr/testify/pull/1761)\n- suite: faster methods filtering (internal refactor) by [@​dolmen](https://redirect.github.com/dolmen) in [#​1758](https://redirect.github.com/stretchr/testify/pull/1758)\n\n##### Fixes\n\n- assert.ErrorAs: log target type by [@​craig65535](https://redirect.github.com/craig65535) in [#​1345](https://redirect.github.com/stretchr/testify/pull/1345)\n- Fix failure message formatting for Positive and Negative asserts in [#​1062](https://redirect.github.com/stretchr/testify/pull/1062)\n- Improve ErrorIs message when error is nil but an error was expected by [@​tsioftas](https://redirect.github.com/tsioftas) in [#​1681](https://redirect.github.com/stretchr/testify/pull/1681)\n- fix Subset/NotSubset when calling with mixed input types by [@​siliconbrain](https://redirect.github.com/siliconbrain) in [#​1729](https://redirect.github.com/stretchr/testify/pull/1729)\n- Improve ErrorAs failure message when error is nil by [@​ccoVeille](https://redirect.github.com/ccoVeille) in [#​1734](https://redirect.github.com/stretchr/testify/pull/1734)\n- mock.AssertNumberOfCalls: improve error msg by [@​3scalation](https://redirect.github.com/3scalation) in [#​1743](https://redirect.github.com/stretchr/testify/pull/1743)\n\n##### Documentation, Build & CI\n\n- docs: Fix typo in README by [@​alexandear](https://redirect.github.com/alexandear) in [#​1688](https://redirect.github.com/stretchr/testify/pull/1688)\n- Replace deprecated io/ioutil with io and os by [@​alexandear](https://redirect.github.com/alexandear) in [#​1684](https://redirect.github.com/stretchr/testify/pull/1684)\n- Document consequences of calling t.FailNow() by [@​greg0ire](https://redirect.github.com/greg0ire) in [#​1710](https://redirect.github.com/stretchr/testify/pull/1710)\n- chore: update docs for Unset [#​1621](https://redirect.github.com/stretchr/testify/issues/1621) by [@​techfg](https://redirect.github.com/techfg) in [#​1709](https://redirect.github.com/stretchr/testify/pull/1709)\n- README: apply gofmt to examples by [@​alexandear](https://redirect.github.com/alexandear) in [#​1687](https://redirect.github.com/stretchr/testify/pull/1687)\n- refactor: use %q and %T to simplify fmt.Sprintf by [@​alexandear](https://redirect.github.com/alexandear) in [#​1674](https://redirect.github.com/stretchr/testify/pull/1674)\n- Propose Christophe Colombier (ccoVeille) as approver by [@​brackendawson](https://redirect.github.com/brackendawson) in [#​1716](https://redirect.github.com/stretchr/testify/pull/1716)\n- Update documentation for the Error function in assert or require package by [@​architagr](https://redirect.github.com/architagr) in [#​1675](https://redirect.github.com/stretchr/testify/pull/1675)\n- assert: remove deprecated build constraints by [@​alexandear](https://redirect.github.com/alexandear) in [#​1671](https://redirect.github.com/stretchr/testify/pull/1671)\n- assert: apply gofumpt to internal test suite by [@​ccoVeille](https://redirect.github.com/ccoVeille) in [#​1739](https://redirect.github.com/stretchr/testify/pull/1739)\n- CI: fix shebang in .ci.\\*.sh scripts by [@​dolmen](https://redirect.github.com/dolmen) in [#​1746](https://redirect.github.com/stretchr/testify/pull/1746)\n- assert,require: enable parallel testing on (almost) all top tests by [@​dolmen](https://redirect.github.com/dolmen) in [#​1747](https://redirect.github.com/stretchr/testify/pull/1747)\n- suite.Passed: add one more status test report by [@​Ararsa-Derese](https://redirect.github.com/Ararsa-Derese) in [#​1706](https://redirect.github.com/stretchr/testify/pull/1706)\n- Add Helper() method in internal mocks and assert.CollectT by [@​dolmen](https://redirect.github.com/dolmen) in [#​1423](https://redirect.github.com/stretchr/testify/pull/1423)\n- assert.Same/NotSame: improve usage of Sprintf by [@​ccoVeille](https://redirect.github.com/ccoVeille) in [#​1742](https://redirect.github.com/stretchr/testify/pull/1742)\n- mock: enable parallel testing on internal testsuite by [@​dolmen](https://redirect.github.com/dolmen) in [#​1756](https://redirect.github.com/stretchr/testify/pull/1756)\n- suite: cleanup use of 'testing' internals at runtime by [@​dolmen](https://redirect.github.com/dolmen) in [#​1751](https://redirect.github.com/stretchr/testify/pull/1751)\n- assert: check test failure message for Empty and NotEmpty by [@​ccoVeille](https://redirect.github.com/ccoVeille) in [#​1745](https://redirect.github.com/stretchr/testify/pull/1745)\n- deps: fix dependency cycle with objx (again) by [@​dolmen](https://redirect.github.com/dolmen) in [#​1567](https://redirect.github.com/stretchr/testify/pull/1567)\n- assert.Empty: comprehensive doc of \"Empty\"-ness rules by [@​dolmen](https://redirect.github.com/dolmen) in [#​1753](https://redirect.github.com/stretchr/testify/pull/1753)\n- doc: improve godoc of top level 'testify' package by [@​dolmen](https://redirect.github.com/dolmen) in [#​1760](https://redirect.github.com/stretchr/testify/pull/1760)\n- assert.ErrorAs: simplify retrieving the type name by [@​ccoVeille](https://redirect.github.com/ccoVeille) in [#​1740](https://redirect.github.com/stretchr/testify/pull/1740)\n- assert.EqualValues: improve test coverage to 100% by [@​dolmen](https://redirect.github.com/dolmen) in [#​1763](https://redirect.github.com/stretchr/testify/pull/1763)\n- suite.Run: simplify running of Setup/TeardownSuite by [@​renzoarreaza](https://redirect.github.com/renzoarreaza) in [#​1769](https://redirect.github.com/stretchr/testify/pull/1769)\n- assert.CallerInfo: micro optimization by using LastIndexByte by [@​dolmen](https://redirect.github.com/dolmen) in [#​1767](https://redirect.github.com/stretchr/testify/pull/1767)\n- assert.CallerInfo: micro cleanup by [@​dolmen](https://redirect.github.com/dolmen) in [#​1768](https://redirect.github.com/stretchr/testify/pull/1768)\n- assert: refactor Test*FileExists and Test*DirExists tests to enable parallel testing by [@​dolmen](https://redirect.github.com/dolmen) in [#​1766](https://redirect.github.com/stretchr/testify/pull/1766)\n- suite.Run: refactor handling of stats for improved readability by [@​dolmen](https://redirect.github.com/dolmen) in [#​1764](https://redirect.github.com/stretchr/testify/pull/1764)\n- tests: improve captureTestingT helper by [@​ccoVeille](https://redirect.github.com/ccoVeille) in [#​1741](https://redirect.github.com/stretchr/testify/pull/1741)\n- build(deps): bump actions/checkout from 4 to 5 by [@​dependabot](https://redirect.github.com/dependabot)\\[bot] in [#​1778](https://redirect.github.com/stretchr/testify/pull/1778)\n\n#### New Contributors\n\n- [@​greg0ire](https://redirect.github.com/greg0ire) made their first contribution in [#​1710](https://redirect.github.com/stretchr/testify/pull/1710)\n- [@​techfg](https://redirect.github.com/techfg) made their first contribution in [#​1709](https://redirect.github.com/stretchr/testify/pull/1709)\n- [@​mikeauclair](https://redirect.github.com/mikeauclair) made their first contribution in [#​1614](https://redirect.github.com/stretchr/testify/pull/1614)\n- [@​cszczepaniak](https://redirect.github.com/cszczepaniak) made their first contribution in [#​1427](https://redirect.github.com/stretchr/testify/pull/1427)\n- [@​architagr](https://redirect.github.com/architagr) made their first contribution in [#​1675](https://redirect.github.com/stretchr/testify/pull/1675)\n- [@​tsioftas](https://redirect.github.com/tsioftas) made their first contribution in [#​1681](https://redirect.github.com/stretchr/testify/pull/1681)\n- [@​siliconbrain](https://redirect.github.com/siliconbrain) made their first contribution in [#​1729](https://redirect.github.com/stretchr/testify/pull/1729)\n- [@​bartventer](https://redirect.github.com/bartventer) made their first contribution in [#​1730](https://redirect.github.com/stretchr/testify/pull/1730)\n- [@​Ararsa-Derese](https://redirect.github.com/Ararsa-Derese) made their first contribution in [#​1706](https://redirect.github.com/stretchr/testify/pull/1706)\n- [@​renzoarreaza](https://redirect.github.com/renzoarreaza) made their first contribution in [#​1769](https://redirect.github.com/stretchr/testify/pull/1769)\n- [@​3scalation](https://redirect.github.com/3scalation) made their first contribution in [#​1743](https://redirect.github.com/stretchr/testify/pull/1743)\n\n**Full Changelog**: <https://github.com/stretchr/testify/compare/v1.10.0...v1.11.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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS44Mi43IiwidXBkYXRlZEluVmVyIjoiNDEuODIuNyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -8,7 +8,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n \tgithub.com/hashicorp/terraform-json v0.26.0\n-\tgithub.com/stretchr/testify v1.10.0\n+\tgithub.com/stretchr/testify v1.11.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n -237,8 +237,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=\n-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n+github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=\n+github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -8,7 +8,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n \tgithub.com/hashicorp/terraform-json v0.26.0\n-\tgithub.com/stretchr/testify v1.10.0\n+\tgithub.com/stretchr/testify v1.11.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n---\ntest/integration/go.sum\n@@ -237,8 +237,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=\n-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n+github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=\n+github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -8,7 +8,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n \tgithub.com/hashicorp/terraform-json v0.26.0\n-\tgithub.com/stretchr/testify v1.10.0\n+\tgithub.com/stretchr/testify v1.11.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n---\ntest/integration/go.sum\n@@ -237,8 +237,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n \n---\ntest/integration/go.sum\n@@ v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=\n-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n+github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=\n+github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -8,7 +8,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n \tgithub.com/hashicorp/terraform-json v0.26.0\n-\tgithub.com/stretchr/testify v1.10.0\n+\tgithub.com/stretchr/testify v1.11.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n---\ntest/integration/go.sum\n@@ -237,8 +237,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=\n-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n+github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=\n+github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson github.com/tidwall/gjson h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| nginx | kubernetes_pod | patch | `1.29.0` -> `1.29.1` |\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS44MS4yIiwidXBkYXRlZEluVmVyIjoiNDEuODEuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.29.0\"\n+ image = \"nginx:1.29.1\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice B:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.29.0\"\n+ image = \"nginx:1.29.1\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice C:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.29.0\"\n+ image = \"nginx:1.29.1\"\n name = \"nginx-example\"\n \"nginx:1.29.1\"\n }\n---\n\n\n---\n\nChoice D:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.29.0\"\n+ image = \"nginx:1.29.1\"\n name = \"nginx-example\"\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 Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Confidence |\n|---|---|---|---|\n| [github.com/hashicorp/terraform-json](https://redirect.github.com/hashicorp/terraform-json) | `v0.25.0` -> `v0.26.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>hashicorp/terraform-json (github.com/hashicorp/terraform-json)</summary>\n\n### [`v0.26.0`](https://redirect.github.com/hashicorp/terraform-json/releases/tag/v0.26.0)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-json/compare/v0.25.0...v0.26.0)\n\n#### ENHANCEMENTS:\n\n- Added: support for list resource by [@​anubhav-goel](https://redirect.github.com/anubhav-goel) in [https://github.com/hashicorp/terraform-json/pull/165](https://redirect.github.com/hashicorp/terraform-json/pull/165)\n\n#### INTERNAL:\n\n- Bump actions/setup-go from 5.4.0 to 5.5.0 in the github-actions-backward-compatible group by [@​dependabot](https://redirect.github.com/dependabot)\\[bot] in[https://github.com/hashicorp/terraform-json/pull/161](https://redirect.github.com/hashicorp/terraform-json/pull/161)1\n- github: Add PR template with required fields for PCI compliance by [@​xiehan](https://redirect.github.com/xiehan) in [https://github.com/hashicorp/terraform-json/pull/162](https://redirect.github.com/hashicorp/terraform-json/pull/162)\n- Bump github.com/zclconf/go-cty from 1.16.2 to 1.16.3 by [@​dependabot](https://redirect.github.com/dependabot)\\[bot] in[https://github.com/hashicorp/terraform-json/pull/163](https://redirect.github.com/hashicorp/terraform-json/pull/163)3\n\n#### New Contributors\n\n- [@​anubhav-goel](https://redirect.github.com/anubhav-goel) made their first contribution in [https://github.com/hashicorp/terraform-json/pull/165](https://redirect.github.com/hashicorp/terraform-json/pull/165)\n\n**Full Changelog**: https://github.com/hashicorp/terraform-json/compare/v0.25.0...v0.26.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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS44MS4yIiwidXBkYXRlZEluVmVyIjoiNDEuODEuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -7,7 +7,7 @@ toolchain go1.24.6\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n-\tgithub.com/hashicorp/terraform-json v0.25.0\n+\tgithub.com/hashicorp/terraform-json v0.26.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n@@ -115,7 +115,7 @@ require (\n \tgithub.com/urfave/cli/v2 github.com/hashicorp/hcl/v2 // indirect\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n-\tgithub.com/zclconf/go-cty v1.16.2 // indirect\n+\tgithub.com/zclconf/go-cty v1.16.3 // indirect\n \tgo.yaml.in/yaml/v2 v2.4.2 // indirect\n \tgo.yaml.in/yaml/v3 v3.0.3 // indirect\n \tgolang.org/x/crypto v0.39.0 // indirect\n---\ntest/integration/go.sum\n@@ -157,8 +157,8 @@ github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul1\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d h1:OtLDHysmVW+zEeWF7VWRvGALkOgws3cmDd2QI1xAAhw=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n-github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=\n-github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=\n+github.com/hashicorp/terraform-json v0.26.0 h1:+BnJavhRH+oyNWPnfzrfQwVWCZBFMvjdiH2Vi38Udz4=\n+github.com/hashicorp/terraform-json v0.26.0/go.mod h1:eyWCeC3nrZamyrKLFnrvwpc3LQPIJsx8hWHQ/nu2/v4=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=\n github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=\n@@ -261,8 +261,8 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT\n github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=\n github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n-github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n-github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n+github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk=\n+github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -7,7 +7,7 @@ toolchain go1.24.6\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n-\tgithub.com/hashicorp/terraform-json v0.25.0\n+\tgithub.com/hashicorp/terraform-json v0.26.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n@@ -115,7 +115,7 @@ require (\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n-\tgithub.com/zclconf/go-cty v1.16.2 // indirect\n+\tgithub.com/zclconf/go-cty v1.16.3 // indirect\n \tgo.yaml.in/yaml/v2 v2.4.2 // h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n \tgo.yaml.in/yaml/v3 v3.0.3 // indirect\n \tgolang.org/x/crypto v0.39.0 // indirect\n---\ntest/integration/go.sum\n@@ -157,8 +157,8 @@ github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul1\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d h1:OtLDHysmVW+zEeWF7VWRvGALkOgws3cmDd2QI1xAAhw=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n-github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=\n-github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=\n+github.com/hashicorp/terraform-json v0.26.0 h1:+BnJavhRH+oyNWPnfzrfQwVWCZBFMvjdiH2Vi38Udz4=\n+github.com/hashicorp/terraform-json v0.26.0/go.mod h1:eyWCeC3nrZamyrKLFnrvwpc3LQPIJsx8hWHQ/nu2/v4=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=\n github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=\n@@ -261,8 +261,8 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT\n github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=\n github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n-github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n-github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n+github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk=\n+github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -7,7 +7,7 @@ toolchain go1.24.6\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n-\tgithub.com/hashicorp/terraform-json v0.25.0\n+\tgithub.com/hashicorp/terraform-json v0.26.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n@@ -115,7 +115,7 @@ require (\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n-\tgithub.com/zclconf/go-cty v1.16.2 // indirect\n+\tgithub.com/zclconf/go-cty v1.16.3 // indirect\n \tgo.yaml.in/yaml/v2 v2.4.2 // indirect\n \tgo.yaml.in/yaml/v3 v3.0.3 // indirect\n \tgolang.org/x/crypto v0.39.0 // indirect\n---\ntest/integration/go.sum\n@@ -157,8 +157,8 @@ github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul1\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d h1:OtLDHysmVW+zEeWF7VWRvGALkOgws3cmDd2QI1xAAhw=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n-github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=\n-github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=\n+github.com/hashicorp/terraform-json v0.26.0 h1:+BnJavhRH+oyNWPnfzrfQwVWCZBFMvjdiH2Vi38Udz4=\n+github.com/hashicorp/terraform-json v0.26.0/go.mod h1:eyWCeC3nrZamyrKLFnrvwpc3LQPIJsx8hWHQ/nu2/v4=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=\n github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=\n@@ -261,8 +261,8 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT\n github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=\n github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n-github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n-github.com/zclconf/go-cty v2.22.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n+github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk=\n+github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -7,7 +7,7 @@ toolchain go1.24.6\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n-\tgithub.com/hashicorp/terraform-json v0.25.0\n+\tgithub.com/hashicorp/terraform-json v0.26.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n@@ -115,7 +115,7 @@ require (\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n-\tgithub.com/zclconf/go-cty v1.16.2 // indirect\n+\tgithub.com/zclconf/go-cty v1.16.3 // indirect\n \tgo.yaml.in/yaml/v2 v2.4.2 // indirect\n \tgo.yaml.in/yaml/v3 v3.0.3 // indirect\n \tgolang.org/x/crypto v0.39.0 // indirect\n---\ntest/integration/go.sum\n@@ -157,8 +157,8 @@ github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul1\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d h1:OtLDHysmVW+zEeWF7VWRvGALkOgws3cmDd2QI1xAAhw=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n-github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=\n-github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=\n+github.com/hashicorp/terraform-json v0.26.0 h1:+BnJavhRH+oyNWPnfzrfQwVWCZBFMvjdiH2Vi38Udz4=\n+github.com/hashicorp/terraform-json v0.26.0/go.mod h1:eyWCeC3nrZamyrKLFnrvwpc3LQPIJsx8hWHQ/nu2/v4=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=\n github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=\n@@ -261,8 +261,8 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT\n github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=\n github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n-github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n-github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n+github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk=\n+github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR update the list of roles and services required by the ADC modules\n\n---\n\nChoice A:\nexamples/gke_autopilot_cluster/main.tf\n@@ -33,7 +33,8 @@ provider \"kubernetes\" {\n }\n \n module \"gke\" {\n- source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-autopilot-cluster\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-autopilot-cluster\"\n+ version = \"~> 38.0\"\n \n project = var.project_id\n name = \"${local.cluster_type}-cluster\"\n---\nexamples/gke_standard_cluster/main.tf\n@@ -34,7 +34,8 @@ data \"google_compute_subnetwork\" \"subnetwork\" {\n }\n \n module \"gke\" {\n- source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-standard-cluster\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-standard-cluster\"\n+ version = \"~> 38.0\"\n \n project = var.project_id\n name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n@@ -83,7 +84,8 @@ module \"gke\" {\n }\n \n module \"node_pool\" {\n- source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool\"\n+ version = \"~> 38.0\"\n \n project = var.project_id\n location = var.region\n---\nmodules/gke-autopilot-cluster/metadata.yaml\n@@ -569,7 +569,12 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/editor\n+ - roles/compute.admin\n+ - roles/container.admin\n+ - roles/iam.serviceAccountUser\n+ services:\n+ - compute.googleapis.com\n+ - container.googleapis.com\n providerVersions:\n - source: hashicorp/google-beta\n version: \">= 6.33.0, < 7\"\n---\nmodules/gke-node-pool/metadata.yaml\n@@ -403,7 +403,12 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/editor\n+ - roles/compute.admin\n+ - roles/container.admin\n+ - roles/iam.serviceAccountUser\n+ services:\n+ - compute.googleapis.com\n+ - container.googleapis.com\n providerVersions:\n - source: hashicorp/google-beta\n version: \">= 6.33.0, < 7\"\n---\nmodules/gke-standard-cluster/metadata.yaml\n@@ -1008,7 +1008,12 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/editor\n+ - roles/compute.admin\n+ - roles/container.admin\n+ - roles/iam.serviceAccountUser\n+ services:\n+ - compute.googleapis.com\n+ - container.googleapis.com\n providerVersions:\n - source: hashicorp/google-beta\n version: \">= 6.33.0, < 7\"\n---\ntest/setup/iam.tf\n@@ -66,15 +66,27 @@ locals {\n binary-authorization = [\"roles/editor\"],\n fleet-app-operator-permissions = [\"roles/editor\"],\n fleet-membership = [\"roles/editor\"],\n- gke-autopilot-cluster = [\"roles/editor\"],\n- gke-node-pool = [\"roles/editor\"],\n- gke-standard-cluster = [\"roles/editor\"],\n- hub-legacy = [\"roles/editor\"],\n- private-cluster = [\"roles/editor\"],\n- private-cluster-update-variant = [\"roles/editor\"],\n- safer-cluster = [\"roles/editor\"],\n- safer-cluster-update-variant = [\"roles/editor\"],\n- workload-identity = [\"roles/editor\"],\n+ gke-autopilot-cluster = [\n+ \"roles/compute.admin\",\n+ \"roles/container.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ],\n+ gke-node-pool = [\n+ \"roles/compute.admin\",\n+ \"roles/container.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ],\n+ gke-standard-cluster = [\n+ \"roles/compute.admin\",\n+ \"roles/container.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ],\n+ hub-legacy = [\"roles/editor\"],\n+ private-cluster = [\"roles/editor\"],\n+ private-cluster-update-variant = [\"roles/editor\"],\n+ safer-cluster = [\"roles/editor\"],\n+ safer-cluster-update-variant = [\"roles/editor\"],\n+ workload-identity = [\"roles/editor\"],\n }\n }\n \n---\ntest/setup/main.tf\n@@ -44,9 +44,18 @@ locals {\n ]\n \n per_module_services = {\n- gke-autopilot-cluster = [],\n- gke-node-pool = [],\n- gke-autopilot-cluster = [],\n+ gke-autopilot-cluster = [\n+ \"compute.googleapis.com\",\n+ \"container.googleapis.com\",\n+ ],\n+ gke-node-pool = [\n+ \"compute.googleapis.com\",\n+ \"container.googleapis.com\",\n+ ],\n+ gke-standard-cluster = [\n+ \"compute.googleapis.com\",\n+ \"container.googleapis.com\",\n+ ],\n }\n }\n \n---\n\n\n---\n\nChoice B:\nexamples/gke_autopilot_cluster/main.tf\n@@ -33,7 +33,8 @@ provider \"kubernetes\" {\n }\n \n module \"gke\" {\n- source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-autopilot-cluster\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-autopilot-cluster\"\n+ version = \"~> 38.0\"\n \n project = var.project_id\n name = \"${local.cluster_type}-cluster\"\n---\nexamples/gke_standard_cluster/main.tf\n@@ -34,7 +34,8 @@ data \"google_compute_subnetwork\" \"subnetwork\" {\n }\n \n module \"gke\" {\n- source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-standard-cluster\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-standard-cluster\"\n+ version = \"~> 38.0\"\n \n project = var.project_id\n name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n@@ -83,7 +84,8 @@ module \"gke\" {\n }\n \n module \"node_pool\" {\n- source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool\"\n+ version = \"~> 38.0\"\n \n project = var.project_id\n location = var.region\n---\nmodules/gke-autopilot-cluster/metadata.yaml\n@@ -569,7 +569,12 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/editor\n+ - roles/compute.admin\n+ - roles/container.admin\n+ - roles/iam.serviceAccountUser\n+ services:\n+ - compute.googleapis.com\n+ - container.googleapis.com\n providerVersions:\n - source: hashicorp/google-beta\n version: \">= 6.33.0, < 7\"\n---\nmodules/gke-node-pool/metadata.yaml\n@@ -403,7 +403,12 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/editor\n+ - roles/compute.admin\n+ - roles/container.admin\n+ - roles/iam.serviceAccountUser\n+ services:\n+ - compute.googleapis.com\n+ - container.googleapis.com\n providerVersions:\n - source: hashicorp/google-beta\n version: \">= 6.33.0, < 7\"\n---\nmodules/gke-standard-cluster/metadata.yaml\n@@ -1008,7 +1008,12 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/editor\n+ - roles/compute.admin\n+ - roles/container.admin\n+ - roles/iam.serviceAccountUser\n+ services:\n+ - compute.googleapis.com\n+ - container.googleapis.com\n providerVersions:\n - source: hashicorp/google-beta\n version: \">= 6.33.0, < 7\"\n---\ntest/setup/iam.tf\n@@ -66,15 +66,27 @@ locals {\n binary-authorization = [\"roles/editor\"],\n fleet-app-operator-permissions = [\"roles/editor\"],\n fleet-membership = [\"roles/editor\"],\n- gke-autopilot-cluster = [\"roles/editor\"],\n- gke-node-pool = [\"roles/editor\"],\n- gke-standard-cluster = [\"roles/editor\"],\n- hub-legacy = [\"roles/editor\"],\n- private-cluster = [\"roles/editor\"],\n- private-cluster-update-variant = [\"roles/editor\"],\n- safer-cluster = [\"roles/editor\"],\n- safer-cluster-update-variant = [\"roles/editor\"],\n- workload-identity = [\"roles/editor\"],\n+ gke-autopilot-cluster = [\n+ \"roles/compute.admin\",\n+ \"roles/container.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ],\n+ gke-node-pool = [\n+ \"roles/compute.admin\",\n+ \"roles/container.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ],\n+ gke-standard-cluster = [\n+ \"roles/compute.admin\",\n+ \"roles/container.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ],\n+ hub-legacy = [\"roles/editor\"],\n+ private-cluster = [\"roles/editor\"],\n+ private-cluster-update-variant = [\"roles/editor\"],\n+ safer-cluster = [\"roles/editor\"],\n+ safer-cluster-update-variant = [\"roles/editor\"],\n+ workload-identity = [\"roles/editor\"],\n }\n }\n \n---\ntest/setup/main.tf\n@@ -44,9 +44,18 @@ locals {\n ]\n \n per_module_services = {\n- gke-autopilot-cluster = [],\n- gke-node-pool = [],\n- gke-autopilot-cluster = [],\n+ gke-autopilot-cluster = [\n+ \"compute.googleapis.com\",\n+ \"container.googleapis.com\",\n+ ],\n+ gke-node-pool = [\n+ \"compute.googleapis.com\",\n+ \"container.googleapis.com\",\n+ ],\n+ gke-standard-cluster = [\n+ \"compute.googleapis.com\",\n+ \"container.googleapis.com\",\n+ ],\n }\n }\n \n---\n\n\n---\n\nChoice C:\nexamples/gke_autopilot_cluster/main.tf\n@@ -33,7 +33,8 @@ provider \"kubernetes\" {\n }\n \n module \"gke\" {\n- source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-autopilot-cluster\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-autopilot-cluster\"\n+ version = \"~> 38.0\"\n \n project = var.project_id\n name = \"${local.cluster_type}-cluster\"\n---\nexamples/gke_standard_cluster/main.tf\n@@ -34,7 +34,8 @@ data \"google_compute_subnetwork\" \"subnetwork\" {\n }\n \n module \"gke\" {\n- source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-standard-cluster\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-standard-cluster\"\n+ version = \"~> 38.0\"\n \n project = var.project_id\n name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n@@ -83,7 +84,8 @@ module \"gke\" {\n }\n \n module \"node_pool\" {\n- source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool\"\n+ version = \"~> 38.0\"\n \n project = var.project_id\n location = var.region\n---\nmodules/gke-autopilot-cluster/metadata.yaml\n@@ -569,7 +569,12 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/editor\n+ - roles/compute.admin\n+ - roles/container.admin\n+ - roles/iam.serviceAccountUser\n+ services:\n+ - compute.googleapis.com\n+ - container.googleapis.com\n providerVersions:\n - source: hashicorp/google-beta\n version: \">= 6.33.0, < 7\"\n---\nmodules/gke-node-pool/metadata.yaml\n@@ -403,7 +403,12 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/editor\n+ - roles/compute.admin\n+ - roles/container.admin\n+ - roles/iam.serviceAccountUser\n+ services:\n+ - compute.googleapis.com\n+ - container.googleapis.com\n providerVersions:\n - source: hashicorp/google-beta\n version: \">= 6.33.0, < 7\"\n---\nmodules/gke-standard-cluster/metadata.yaml\n@@ -1008,7 +1008,12 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/editor\n+ - roles/compute.admin\n+ - roles/container.admin\n+ - roles/iam.serviceAccountUser\n+ services:\n+ - compute.googleapis.com\n+ - container.googleapis.com\n providerVersions:\n - source: hashicorp/google-beta\n version: \">= 6.33.0, < 7\"\n---\ntest/setup/iam.tf\n@@ -66,15 +66,27 @@ locals {\n binary-authorization = [\"roles/editor\"],\n fleet-app-operator-permissions = [\"roles/editor\"],\n fleet-membership = [\"roles/editor\"],\n- gke-autopilot-cluster = [\"roles/editor\"],\n- gke-node-pool = [\"roles/editor\"],\n- gke-standard-cluster = [\"roles/editor\"],\n- hub-legacy = [\"roles/editor\"],\n- private-cluster = [\"roles/editor\"],\n- private-cluster-update-variant = [\"roles/editor\"],\n- safer-cluster = [\"roles/editor\"],\n- safer-cluster-update-variant = [\"roles/editor\"],\n- workload-identity = [\"roles/editor\"],\n+ gke-autopilot-cluster = [\n+ \"roles/compute.admin\",\n+ \"roles/container.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ],\n+ gke-node-pool = [\n+ module \"roles/compute.admin\",\n+ \"roles/container.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ],\n+ gke-standard-cluster = [\n+ \"roles/compute.admin\",\n+ \"roles/container.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ],\n+ hub-legacy = [\"roles/editor\"],\n+ private-cluster = [\"roles/editor\"],\n+ private-cluster-update-variant = [\"roles/editor\"],\n+ safer-cluster = [\"roles/editor\"],\n+ safer-cluster-update-variant = [\"roles/editor\"],\n+ workload-identity = [\"roles/editor\"],\n }\n }\n \n---\ntest/setup/main.tf\n@@ -44,9 +44,18 @@ locals {\n ]\n \n per_module_services = {\n- gke-autopilot-cluster = [],\n- gke-node-pool = [],\n- gke-autopilot-cluster = [],\n+ gke-autopilot-cluster = [\n+ \"compute.googleapis.com\",\n+ \"container.googleapis.com\",\n+ ],\n+ gke-node-pool = [\n+ \"compute.googleapis.com\",\n+ \"container.googleapis.com\",\n+ ],\n+ gke-standard-cluster = [\n+ \"compute.googleapis.com\",\n+ \"container.googleapis.com\",\n+ ],\n }\n }\n \n---\n\n\n---\n\nChoice D:\nexamples/gke_autopilot_cluster/main.tf\n@@ -33,7 +33,8 @@ provider \"kubernetes\" {\n }\n \n module \"gke\" {\n- source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-autopilot-cluster\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-autopilot-cluster\"\n+ version = \"~> 38.0\"\n \n project = var.project_id\n name = \"${local.cluster_type}-cluster\"\n---\nexamples/gke_standard_cluster/main.tf\n@@ -34,7 +34,8 @@ data \"google_compute_subnetwork\" \"subnetwork\" {\n }\n \n module \"gke\" {\n- source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-standard-cluster\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-standard-cluster\"\n+ version = \"~> 38.0\"\n \n project = var.project_id\n name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n@@ -83,7 +84,8 @@ module \"gke\" {\n }\n \n module \"node_pool\" {\n- source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool\"\n+ version = \"~> 38.0\"\n \n project = var.project_id\n location = var.region\n---\nmodules/gke-autopilot-cluster/metadata.yaml\n@@ -569,7 +569,12 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/editor\n+ - roles/compute.admin\n+ - roles/container.admin\n+ - roles/iam.serviceAccountUser\n+ services:\n+ - compute.googleapis.com\n+ - container.googleapis.com\n providerVersions:\n - source: hashicorp/google-beta\n version: \">= 6.33.0, < 7\"\n---\nmodules/gke-node-pool/metadata.yaml\n@@ -403,7 +403,12 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/editor\n+ - roles/compute.admin\n+ - roles/container.admin\n+ - roles/iam.serviceAccountUser\n+ services:\n+ - compute.googleapis.com\n+ - container.googleapis.com\n providerVersions:\n - source: hashicorp/google-beta\n version: \">= 6.33.0, < 7\"\n---\nmodules/gke-standard-cluster/metadata.yaml\n@@ -1008,7 +1008,12 @@ spec:\n roles:\n - level: Project\n roles:\n- - roles/editor\n+ - roles/compute.admin\n+ - roles/container.admin\n+ - roles/iam.serviceAccountUser\n+ services:\n+ - compute.googleapis.com\n+ - container.googleapis.com\n providerVersions:\n - source: hashicorp/google-beta\n version: \">= 6.33.0, < 7\"\n---\ntest/setup/iam.tf\n@@ -66,15 +66,27 @@ locals {\n binary-authorization = [\"roles/editor\"],\n fleet-app-operator-permissions = [\"roles/editor\"],\n fleet-membership = [\"roles/editor\"],\n- gke-autopilot-cluster = [\"roles/editor\"],\n- gke-node-pool = [\"roles/editor\"],\n- gke-standard-cluster = [\"roles/editor\"],\n- hub-legacy = [\"roles/editor\"],\n- private-cluster = [\"roles/editor\"],\n- private-cluster-update-variant = [\"roles/editor\"],\n- safer-cluster = [\"roles/editor\"],\n- safer-cluster-update-variant = [\"roles/editor\"],\n- workload-identity = [\"roles/editor\"],\n+ gke-autopilot-cluster = [\n+ \"roles/compute.admin\",\n+ \"roles/container.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ],\n+ gke-node-pool = [\n+ \"roles/compute.admin\",\n+ \"roles/container.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ],\n+ gke-standard-cluster = [\n+ \"roles/compute.admin\",\n+ \"roles/container.admin\",\n+ \"roles/iam.serviceAccountUser\",\n+ ],\n+ hub-legacy = [\"roles/editor\"],\n+ private-cluster = [\"roles/editor\"],\n+ private-cluster-update-variant = [\"roles/editor\"],\n+ safer-cluster = [\"roles/editor\"],\n+ safer-cluster-update-variant = [\"roles/editor\"],\n+ workload-identity = [\"roles/editor\"],\n }\n }\n \n---\ntest/setup/main.tf\n@@ -44,9 +44,18 @@ locals {\n ]\n \n per_module_services = {\n- gke-autopilot-cluster = [],\n- gke-node-pool = [],\n- gke-autopilot-cluster = [],\n+ gke-autopilot-cluster = [\n+ \"compute.googleapis.com\",\n+ \"container.googleapis.com\",\n+ ],\n+ gke-node-pool = [\n+ \"compute.googleapis.com\",\n+ \"container.googleapis.com\",\n+ ],\n+ gke-standard-cluster = [\n+ \"compute.googleapis.com\",\n+ \"container.googleapis.com\",\n+ ],\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 Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nignore subject case\n\n---\n\nChoice A:\n.github/workflows/lint.yaml\n@@ -67,7 +67,7 @@ jobs:\n - name: Install commitlint\n run: |\n npm install -D @commitlint/cli@19.8.1 @commitlint/config-conventional@19.8.1\n- echo \"module.exports = { extends: ['@commitlint/config-conventional'], };\" > commitlint.config.js\n+ echo \"module.exports = { extends: ['@commitlint/config-conventional'], rules: {'subject-case': [0]} };\" > commitlint.config.js\n npx commitlint --version\n - name: Validate PR commits with commitlint\n if: github.event_name == 'pull_request'\n---\n\n\n---\n\nChoice B:\n\"module.exports -67,7 +67,7 @@ jobs:\n - name: Install commitlint\n run: |\n npm install -D @commitlint/cli@19.8.1 @commitlint/config-conventional@19.8.1\n- echo \"module.exports = { extends: ['@commitlint/config-conventional'], };\" > commitlint.config.js\n+ echo \"module.exports = { extends: ['@commitlint/config-conventional'], rules: {'subject-case': [0]} };\" > commitlint.config.js\n npx commitlint --version\n - name: Validate PR commits with commitlint\n if: github.event_name == 'pull_request'\n---\n\n\n---\n\nChoice C:\n.github/workflows/lint.yaml\n@@ -67,7 +67,7 @@ jobs:\n - name: Install commitlint\n };\" run: |\n npm install -D @commitlint/cli@19.8.1 @commitlint/config-conventional@19.8.1\n- echo \"module.exports = { extends: ['@commitlint/config-conventional'], };\" > commitlint.config.js\n+ echo \"module.exports = { extends: ['@commitlint/config-conventional'], rules: {'subject-case': [0]} };\" > commitlint.config.js\n npx commitlint --version\n - name: Validate PR commits with commitlint\n if: github.event_name == 'pull_request'\n---\n\n\n---\n\nChoice D:\n.github/workflows/lint.yaml\n@@ -67,7 +67,7 @@ jobs:\n - name: Install commitlint\n run: |\n npm install -D @commitlint/cli@19.8.1 @commitlint/config-conventional@19.8.1\n- echo \"module.exports = { extends: ['@commitlint/config-conventional'], };\" > commitlint.config.js\n+ echo \"module.exports = { extends: ['@commitlint/config-conventional'], rules: {'subject-case': [0]} };\" > commitlint.config.js\n npx commitlint --version\n - name: Validate PR commits with commitlint\n > if: github.event_name == 'pull_request'\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nPoC workflow replacement for `conventionalcommits.org`\n\n---\n\nChoice A:\n.github/workflows/lint.yaml\n@@ -20,8 +20,11 @@ name: 'lint'\n on:\n workflow_dispatch:\n pull_request:\n- branches:\n- - main\n+ types: [opened, edited, reopened, synchronize]\n+ branches: [main]\n+\n+permissions:\n+ contents: read\n \n concurrency:\n group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'\n@@ -47,8 +50,25 @@ jobs:\n - run: docker run --rm -e ENABLE_BPMETADATA -v ${{ github.workspace }}:/workspace ENABLE_BPMETADATA: steps.variables.outputs.dev-tools }} module-swapper\n env:\n ENABLE_BPMETADATA: 1\n-\n - run: docker run --rm -e ENABLE_BPMETADATA -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} /usr/local/bin/test_lint.sh\n env:\n ENABLE_BPMETADATA: 1\n \n+ commitlint:\n+ runs-on: ubuntu-latest\n+ steps:\n+ - uses: actions/checkout@v4\n+ with:\n+ fetch-depth: 0\n+ - name: Setup node\n+ uses: actions/setup-node@v4\n+ with:\n+ node-version: lts/*\n+ - name: Install commitlint\n+ run: |\n+ npm install -D @commitlint/cli@19.8.1 @commitlint/config-conventional@19.8.1\n+ echo \"module.exports = { extends: ['@commitlint/config-conventional'], };\" > commitlint.config.js\n+ npx commitlint --version\n+ - name: Validate PR commits with commitlint\n+ if: github.event_name == 'pull_request'\n+ run: 'echo \"${{ github.event.pull_request.title }}\" | npx commitlint --verbose'\n---\n\n\n---\n\nChoice B:\n.github/workflows/lint.yaml\n@@ -20,8 +20,11 @@ name: 'lint'\n on:\n workflow_dispatch:\n pull_request:\n- branches:\n- - main\n+ types: [opened, edited, reopened, synchronize]\n+ branches: [main]\n+\n+permissions:\n+ contents: read\n \n concurrency:\n group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'\n@@ -47,8 +50,25 @@ jobs:\n - run: docker run --rm -e ENABLE_BPMETADATA -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} module-swapper\n env:\n ENABLE_BPMETADATA: 1\n-\n - run: docker run --rm -e ENABLE_BPMETADATA -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} /usr/local/bin/test_lint.sh\n env:\n ENABLE_BPMETADATA: 1\n \n+ commitlint:\n+ runs-on: ubuntu-latest\n+ steps:\n+ - uses: actions/checkout@v4\n+ with:\n+ fetch-depth: 0\n+ - name: Setup node\n+ uses: actions/setup-node@v4\n+ with:\n+ node-version: lts/*\n+ - name: Install commitlint\n+ run: |\n+ npm install -D @commitlint/cli@19.8.1 @commitlint/config-conventional@19.8.1\n+ echo \"module.exports = { extends: ['@commitlint/config-conventional'], };\" > commitlint.config.js\n+ npx commitlint --version\n+ - name: Validate PR commits with commitlint\n+ if: github.event_name == 'pull_request'\n+ run: 'echo \"${{ github.event.pull_request.title }}\" | npx commitlint --verbose'\n---\n\n\n---\n\nChoice C:\n.github/workflows/lint.yaml\n@@ -20,8 +20,11 @@ name: 'lint'\n on:\n workflow_dispatch:\n pull_request:\n- branches:\n- - main\n+ types: [opened, edited, reopened, synchronize]\n+ branches: [main]\n+\n+permissions:\n+ contents: read\n \n concurrency:\n group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'\n@@ -47,8 +50,25 @@ jobs:\n - run: docker run --rm -e ENABLE_BPMETADATA -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} module-swapper\n env:\n ENABLE_BPMETADATA: 1\n-\n - run: docker run --rm -e ENABLE_BPMETADATA -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} /usr/local/bin/test_lint.sh\n env:\n ENABLE_BPMETADATA: 1\n \n+ commitlint:\n+ runs-on: ubuntu-latest\n+ steps:\n+ - uses: actions/checkout@v4\n+ with:\n+ fetch-depth: 0\n+ - name: Setup node\n+ uses: actions/setup-node@v4\n+ with:\n+ node-version: lts/*\n+ - name: Install commitlint\n+ run: |\n+ npm install -D @commitlint/cli@19.8.1 @commitlint/config-conventional@19.8.1\n+ echo \"module.exports = { extends: ['@commitlint/config-conventional'], };\" > commitlint.config.js\n+ npx commitlint --version\n+ - name: Validate PR commits with commitlint\n+ if: == 'pull_request'\n+ run: 'echo \"${{ github.event.pull_request.title }}\" | npx commitlint --verbose'\n---\n\n\n---\n\nChoice D:\n.github/workflows/lint.yaml\n@@ -20,8 +20,11 @@ name: 'lint'\n on:\n workflow_dispatch:\n pull_request:\n- branches:\n- - main\n+ types: [opened, edited, reopened, synchronize]\n+ branches: [main]\n+\n+permissions:\n+ contents: read\n \n concurrency:\n group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'\n@@ -47,8 +50,25 @@ jobs:\n - run: docker run --rm -e ENABLE_BPMETADATA -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} module-swapper\n env:\n ENABLE_BPMETADATA: 1\n-\n - run: docker run --rm -e ENABLE_BPMETADATA -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} /usr/local/bin/test_lint.sh\n env:\n ENABLE_BPMETADATA: 1\n \n+ commitlint:\n+ runs-on: ubuntu-latest\n+ steps:\n+ - uses: actions/checkout@v4\n+ with:\n+ fetch-depth: 0\n+ - name: Setup node\n+ uses: actions/setup-node@v4\n+ with:\n+ node-version: lts/*\n+ - name: Install commitlint\n+ run: |\n+ npm install -D @commitlint/cli@19.8.1 @commitlint/config-conventional@19.8.1\n+ echo \"module.exports = { extends: ['@commitlint/config-conventional'], };\" > commitlint.config.js\n+ npx commitlint --version\n+ - name: Validate PR commits with commitlint\n+ if: github.event_name == 'pull_request'\n+ run: 'echo \"${{ github.event.pull_request.title }}\" | npx commitlint --verbose'\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | toolchain | patch | `1.24.5` -> `1.24.6` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.24.6`](https://redirect.github.com/golang/go/compare/go1.24.5...go1.24.6)\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS42MC40IiwidXBkYXRlZEluVmVyIjoiNDEuNjAuNCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ go1.24.5\n+toolchain +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.24.5\n+toolchain go1.24.6\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.24.5\n+toolchain go1.24.6\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.24.5\n+toolchain go1.24.6\n \n require (\n +2,7 v0.17.8\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ (\n github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.24.5\n+toolchain go1.24.6\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ndocs/upgrading_to_v38.0.md\n@@ -0,0 +1,9 @@\n+# Upgrading to v38.0\n+The v38.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6.42 or higher of the Google Cloud Platform Providers.\n+\n+### Update variant random ID keepers updated\n+\n+The v38.0 release updates the keepers for the update variant modules. This will force a recreation of the nodepools. To avoid this, it is possible to edit the remote state of the `random_id` resource to add the new attributes.\n---\n\n\n---\n\nChoice B:\ndocs/upgrading_to_v38.0.md\n@@ -0,0 +1,9 @@\n+# Upgrading to v38.0\n+The v38.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### Google Cloud Platform Provider of Terraform Kubernetes Engine Module now requires version 6.42 or higher of the Google Cloud Platform Providers.\n+\n+### Update variant random ID keepers updated\n+\n+The v38.0 release updates the keepers for the update variant modules. This will force a recreation of the nodepools. To avoid this, it is possible to edit the remote state of the `random_id` resource to add the new attributes.\n---\n\n\n---\n\nChoice C:\ndocs/upgrading_to_v38.0.md\n@@ -0,0 +1,9 @@\n+# Upgrading to v38.0\n+The v38.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6.42 or higher of the Google Cloud Platform Providers.\n+\n+### Update variant random ID keepers updated\n+\n+The v38.0 release updates the keepers for the update variant modules. This will force a recreation of the higher To avoid this, it is possible to edit the remote state of the `random_id` resource to add the new attributes.\n---\n\n\n---\n\nChoice D:\ndocs/upgrading_to_v38.0.md\n@@ -0,0 +1,9 @@\n+# Upgrading to v38.0\n+The v38.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6.42 or higher of the Google Cloud Platform Providers.\n+\n+### Update variant random ID keepers updated\n+\n+The v38.0 release updates the keepers for the update variant modules. This will force a recreation of the nodepools. To avoid this, it is possible to edit the remote state of the `random_id` resource to add the new is\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nWhen node_pools_linux_node_configs_sysctls is configured without node_pools_cgroup_mode, the coalesce() function fails because all arguments are empty strings or null.\r\n\r\nFixes: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2382\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -1253,7 +1253,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\ncluster.tf\n@@ -941,7 +941,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -1104,7 +1104,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -1021,7 +1021,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -1082,7 +1082,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -999,7 +999,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -1045,7 +1045,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/private-cluster/cluster.tf\n@@ -963,7 +963,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -1253,7 +1253,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\ncluster.tf\n@@ -941,7 +941,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -1104,7 +1104,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -1021,7 +1021,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -1082,7 +1082,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -999,7 +999,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -1045,7 +1045,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/private-cluster/cluster.tf\n@@ -963,7 +963,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -1253,7 +1253,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\ncluster.tf\n@@ -941,7 +941,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -1104,7 +1104,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -1021,7 +1021,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -1082,7 +1082,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -999,7 +999,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n null)\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -1045,7 +1045,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/private-cluster/cluster.tf\n@@ -963,7 +963,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -1253,7 +1253,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\ncluster.tf\n@@ -941,7 +941,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -1104,7 +1104,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -1021,7 +1021,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -1082,7 +1082,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -999,7 +999,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -1045,7 +1045,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\nmodules/private-cluster/cluster.tf\n@@ -963,7 +963,7 @@ resource \"google_container_node_pool\" \"pools\" {\n local.node_pools_linux_node_configs_sysctls[\"all\"],\n local.node_pools_linux_node_configs_sysctls[each.value[\"name\"]]\n )\n- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"], null)\n+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value[\"name\"]], local.node_pools_cgroup_mode[\"all\"]), null)\n dynamic \"hugepages_config\" {\n for_each = length(merge(\n local.node_pools_hugepage_size_2m[\"all\"] == \"\" ? {} : { cgroup = local.node_pools_hugepage_size_2m[\"all\"] },\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\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-kubernetes-engine/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -119,7 +119,7 @@ require (\n \tgolang.org/x/crypto v0.36.0 // indirect\n \tgolang.org/x/mod v0.24.0 // indirect\n \tgolang.org/x/net v0.38.0 // // v0.24.0 // indirect\n+\tgolang.org/x/oauth2 v0.27.0 // indirect\n \tgolang.org/x/sync v0.12.0 // indirect\n \tgolang.org/x/sys v0.31.0 // indirect\n \tgolang.org/x/term v0.30.0 // indirect\n---\ntest/integration/go.sum\n@@ -280,8 +280,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\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.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n-golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=\n+golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -119,7 +119,7 @@ require (\n \tgolang.org/x/crypto v0.36.0 // indirect\n \tgolang.org/x/mod v0.24.0 // indirect\n \tgolang.org/x/net v0.38.0 // indirect\n-\tgolang.org/x/oauth2 v0.24.0 // indirect\n+\tgolang.org/x/oauth2 v0.27.0 // indirect\n \tgolang.org/x/sync v0.12.0 // // \tgolang.org/x/sys v0.31.0 // indirect\n \tgolang.org/x/term v0.30.0 // indirect\n---\ntest/integration/go.sum\n@@ -280,8 +280,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\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.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n-golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=\n+golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -119,7 +119,7 @@ require (\n \tgolang.org/x/crypto v0.36.0 // indirect\n \tgolang.org/x/mod v0.24.0 // indirect\n \tgolang.org/x/net v0.38.0 // indirect\n-\tgolang.org/x/oauth2 v0.24.0 // indirect\n+\tgolang.org/x/oauth2 v0.27.0 // indirect\n \tgolang.org/x/sync v0.12.0 // indirect\n \tgolang.org/x/sys v0.31.0 // indirect\n (\n v0.30.0 // indirect\n---\ntest/integration/go.sum\n@@ -280,8 +280,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\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.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n-golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=\n+golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -119,7 +119,7 @@ require (\n \tgolang.org/x/crypto v0.36.0 // indirect\n \tgolang.org/x/mod v0.24.0 // indirect\n \tgolang.org/x/net v0.38.0 // indirect\n-\tgolang.org/x/oauth2 v0.24.0 // indirect\n+\tgolang.org/x/oauth2 v0.27.0 // indirect\n \tgolang.org/x/sync v0.12.0 // indirect\n \tgolang.org/x/sys v0.31.0 // indirect\n \tgolang.org/x/term v0.30.0 // indirect\n---\ntest/integration/go.sum\n@@ -280,8 +280,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\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.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n-golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=\n+golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -211,6 +211,10 @@\n \"minNodeCount\": 1\n },\n \"config\": {\n+ \"bootDisk\": {\n+ \"diskType\": \"pd-standard\",\n+ \"sizeGb\": \"100\"\n+ },\n \"diskSizeGb\": 100,\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n---\n\n\n---\n\nChoice B:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -211,6 +211,10 @@\n \"minNodeCount\": 1\n },\n \"config\": {\n+ \"bootDisk\": {\n+ \"diskType\": \"pd-standard\",\n+ \"sizeGb\": \"100\"\n+ },\n \"diskSizeGb\": 100,\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n---\n\n\n---\n\nChoice C:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -211,6 +211,10 @@\n \"minNodeCount\": 1\n },\n \"config\": {\n+ \"bootDisk\": {\n+ \"diskType\": \"pd-standard\",\n+ \"sizeGb\": \"100\"\n+ },\n \"diskSizeGb\": 100,\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n---\n\n\n---\n\nChoice D:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -211,6 +211,10 @@\n \"minNodeCount\": 1\n },\n \"config\": {\n+ \"bootDisk\": {\n+ \"diskType\": \"pd-standard\",\n+ \"sizeGb\": \"100\"\n+ },\n \"diskSizeGb\": 100,\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis feature is currently only available for other clusters, adjusted the template so safer-cluster variants can use it as well.\n\n---\n\nChoice A:\nautogen/safer-cluster/main.tf.tmpl\n@@ -208,6 +208,7 @@ module \"gke\" {\n \n gce_pd_csi_driver = var.gce_pd_csi_driver\n filestore_csi_driver = var.filestore_csi_driver\n+ gcs_fuse_csi_driver = var.gcs_fuse_csi_driver\n \n notification_config_topic = var.notification_config_topic\n \n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -464,6 +464,12 @@ variable \"filestore_csi_driver\" {\n default = false\n }\n \n+variable \"gcs_fuse_csi_driver\" {\n+ type = bool\n+ description = \"Whether GCE FUSE CSI driver is enabled for this cluster.\"\n+ default = false\n+}\n+\n variable \"add_cluster_firewall_rules\" {\n type = bool\n description = \"Create additional firewall rules\"\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -234,6 +234,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | firewall\\_priority | Priority rule for firewall rules | `number` | `1000` | no |\n | gateway\\_api\\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |\n | gce\\_pd\\_csi\\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |\n+| gcs\\_fuse\\_csi\\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |\n | gke\\_backup\\_agent\\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |\n | grant\\_registry\\_access | Grants created cluster-specific service account storage.objectViewer role. | `bool` | `true` | no |\n | horizontal\\_pod\\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -204,6 +204,7 @@ module \"gke\" {\n \n gce_pd_csi_driver = var.gce_pd_csi_driver\n filestore_csi_driver = var.filestore_csi_driver\n+ gcs_fuse_csi_driver = var.gcs_fuse_csi_driver\n \n notification_config_topic = var.notification_config_topic\n \n---\nmodules/safer-cluster-update-variant/metadata.display.yaml\n@@ -127,6 +127,9 @@ spec:\n gce_pd_csi_driver:\n name: gce_pd_csi_driver\n title: Gce Pd Csi Driver\n+ gcs_fuse_csi_driver:\n+ name: gcs_fuse_csi_driver\n+ title: Gcs Fuse Csi Driver\n gke_backup_agent_config:\n name: gke_backup_agent_config\n title: Gke Backup Agent Config\n---\nmodules/safer-cluster-update-variant/metadata.yaml\n@@ -422,6 +422,10 @@ spec:\n description: The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes\n varType: bool\n defaultValue: false\n+ - name: gcs_fuse_csi_driver\n+ description: Whether GCE FUSE CSI driver is enabled for this cluster.\n+ varType: bool\n+ defaultValue: false\n - name: add_cluster_firewall_rules\n description: Create additional firewall rules\n varType: bool\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -464,6 +464,12 @@ variable \"filestore_csi_driver\" {\n default = false\n }\n \n+variable \"gcs_fuse_csi_driver\" {\n+ type = bool\n+ description = \"Whether GCE FUSE CSI driver is enabled for this cluster.\"\n+ default = false\n+}\n+\n variable \"add_cluster_firewall_rules\" {\n type = bool\n description = \"Create additional firewall rules\"\n---\nmodules/safer-cluster/README.md\n@@ -234,6 +234,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | firewall\\_priority | Priority rule for firewall rules | `number` | `1000` | no |\n | gateway\\_api\\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |\n | gce\\_pd\\_csi\\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |\n+| gcs\\_fuse\\_csi\\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |\n | gke\\_backup\\_agent\\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |\n | grant\\_registry\\_access | Grants created cluster-specific service account storage.objectViewer role. | `bool` | `true` | no |\n | horizontal\\_pod\\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -204,6 +204,7 @@ module \"gke\" {\n \n gce_pd_csi_driver = var.gce_pd_csi_driver\n filestore_csi_driver = var.filestore_csi_driver\n+ gcs_fuse_csi_driver = var.gcs_fuse_csi_driver\n \n notification_config_topic = var.notification_config_topic\n \n---\nmodules/safer-cluster/metadata.display.yaml\n@@ -127,6 +127,9 @@ spec:\n gce_pd_csi_driver:\n name: gce_pd_csi_driver\n title: Gce Pd Csi Driver\n+ gcs_fuse_csi_driver:\n+ name: gcs_fuse_csi_driver\n+ title: Gcs Fuse Csi Driver\n gke_backup_agent_config:\n name: gke_backup_agent_config\n title: Gke Backup Agent Config\n---\nmodules/safer-cluster/metadata.yaml\n@@ -422,6 +422,10 @@ spec:\n description: The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes\n varType: bool\n defaultValue: false\n+ - gcs_fuse_csi_driver\n+ gcs_fuse_csi_driver\n+ description: Whether GCE FUSE CSI driver is enabled for this cluster.\n+ varType: bool\n+ defaultValue: false\n - name: add_cluster_firewall_rules\n description: Create additional firewall rules\n varType: bool\n---\nmodules/safer-cluster/variables.tf\n@@ -464,6 +464,12 @@ variable \"filestore_csi_driver\" {\n default = false\n }\n \n+variable \"gcs_fuse_csi_driver\" {\n+ type = bool\n+ description = \"Whether GCE FUSE CSI driver is enabled for this cluster.\"\n+ default = false\n+}\n+\n variable \"add_cluster_firewall_rules\" {\n type = bool\n description = \"Create additional firewall rules\"\n---\n\n\n---\n\nChoice B:\nautogen/safer-cluster/main.tf.tmpl\n@@ -208,6 +208,7 @@ module \"gke\" {\n \n gce_pd_csi_driver = var.gce_pd_csi_driver\n filestore_csi_driver = var.filestore_csi_driver\n+ gcs_fuse_csi_driver = var.gcs_fuse_csi_driver\n \n notification_config_topic = var.notification_config_topic\n \n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -464,6 +464,12 @@ variable \"filestore_csi_driver\" {\n default = false\n }\n \n+variable \"gcs_fuse_csi_driver\" {\n+ type = bool\n+ description = \"Whether GCE FUSE CSI driver is enabled for this cluster.\"\n+ default = false\n+}\n+\n variable \"add_cluster_firewall_rules\" {\n type = bool\n description = \"Create additional firewall rules\"\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -234,6 +234,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | firewall\\_priority | Priority rule for firewall rules | `number` | `1000` | no |\n | gateway\\_api\\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |\n | gce\\_pd\\_csi\\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |\n+| gcs\\_fuse\\_csi\\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |\n | gke\\_backup\\_agent\\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |\n | grant\\_registry\\_access | Grants created cluster-specific service account storage.objectViewer role. | `bool` | `true` | no |\n | horizontal\\_pod\\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -204,6 +204,7 @@ module \"gke\" {\n \n gce_pd_csi_driver = var.gce_pd_csi_driver\n filestore_csi_driver = var.filestore_csi_driver\n+ gcs_fuse_csi_driver = var.gcs_fuse_csi_driver\n \n notification_config_topic = var.notification_config_topic\n \n---\nmodules/safer-cluster-update-variant/metadata.display.yaml\n@@ -127,6 +127,9 @@ spec:\n gce_pd_csi_driver:\n name: gce_pd_csi_driver\n title: Gce Pd Csi Driver\n+ gcs_fuse_csi_driver:\n+ name: gcs_fuse_csi_driver\n+ title: Gcs Fuse Csi Driver\n gke_backup_agent_config:\n name: gke_backup_agent_config\n title: Gke Backup Agent Config\n---\nmodules/safer-cluster-update-variant/metadata.yaml\n@@ -422,6 +422,10 @@ spec:\n description: The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes\n varType: bool\n defaultValue: false\n+ - name: gcs_fuse_csi_driver\n+ description: Whether GCE FUSE CSI driver is enabled for this cluster.\n+ varType: bool\n+ defaultValue: false\n - name: add_cluster_firewall_rules\n description: Create additional firewall rules\n varType: bool\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -464,6 +464,12 @@ variable \"filestore_csi_driver\" {\n default = false\n }\n \n+variable \"gcs_fuse_csi_driver\" {\n+ type = bool\n+ description = \"Whether GCE FUSE CSI driver is enabled for this cluster.\"\n+ default = false\n+}\n+\n variable \"add_cluster_firewall_rules\" {\n type = bool\n description = \"Create additional firewall rules\"\n---\nmodules/safer-cluster/README.md\n@@ -234,6 +234,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | firewall\\_priority | Priority rule for firewall rules | `number` | `1000` | no |\n | gateway\\_api\\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |\n | gce\\_pd\\_csi\\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |\n+| gcs\\_fuse\\_csi\\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |\n | gke\\_backup\\_agent\\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |\n | grant\\_registry\\_access | Grants created cluster-specific service account storage.objectViewer role. | `bool` | `true` | no |\n | horizontal\\_pod\\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -204,6 +204,7 @@ module \"gke\" {\n \n gce_pd_csi_driver = var.gce_pd_csi_driver\n filestore_csi_driver = var.filestore_csi_driver\n+ gcs_fuse_csi_driver = var.gcs_fuse_csi_driver\n \n notification_config_topic = var.notification_config_topic\n \n---\nmodules/safer-cluster/metadata.display.yaml\n@@ -127,6 +127,9 @@ spec:\n gce_pd_csi_driver:\n name: gce_pd_csi_driver\n title: Gce Pd Csi Driver\n+ gcs_fuse_csi_driver:\n+ name: gcs_fuse_csi_driver\n+ title: Gcs Fuse Csi Driver\n gke_backup_agent_config:\n name: gke_backup_agent_config\n title: Gke Backup Agent Config\n---\nmodules/safer-cluster/metadata.yaml\n@@ -422,6 +422,10 @@ spec:\n description: The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes\n varType: bool\n defaultValue: false\n+ - name: gcs_fuse_csi_driver\n+ description: Whether GCE FUSE CSI driver is enabled for this cluster.\n+ varType: bool\n+ defaultValue: false\n - name: add_cluster_firewall_rules\n description: Create additional firewall rules\n varType: bool\n---\nmodules/safer-cluster/variables.tf\n@@ -464,6 +464,12 @@ variable \"filestore_csi_driver\" {\n default = false\n }\n \n+variable \"gcs_fuse_csi_driver\" {\n+ type = bool\n+ description = \"Whether GCE FUSE CSI driver is enabled for this cluster.\"\n+ default = false\n+}\n+\n variable \"add_cluster_firewall_rules\" {\n type = bool\n description = \"Create additional firewall rules\"\n---\n\n\n---\n\nChoice C:\nautogen/safer-cluster/main.tf.tmpl\n@@ -208,6 +208,7 @@ module \"gke\" {\n \n gce_pd_csi_driver = var.gce_pd_csi_driver\n filestore_csi_driver = var.filestore_csi_driver\n+ gcs_fuse_csi_driver = var.gcs_fuse_csi_driver\n \n notification_config_topic = var.notification_config_topic\n \n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -464,6 +464,12 @@ variable \"filestore_csi_driver\" {\n default = false\n }\n \n+variable \"gcs_fuse_csi_driver\" {\n+ type = bool\n+ description = \"Whether GCE FUSE CSI driver is enabled for this cluster.\"\n+ default = false\n+}\n+\n variable \"add_cluster_firewall_rules\" {\n type = bool\n description = \"Create additional firewall rules\"\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -234,6 +234,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | firewall\\_priority | Priority rule for firewall rules | `number` | `1000` | no |\n | gateway\\_api\\_channel | The gateway api channel of this cluster. Accepted spec:\n are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |\n | gce\\_pd\\_csi\\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |\n+| gcs\\_fuse\\_csi\\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |\n | gke\\_backup\\_agent\\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |\n | grant\\_registry\\_access | Grants created cluster-specific service account storage.objectViewer role. | `bool` | `true` | no |\n | horizontal\\_pod\\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -204,6 +204,7 @@ module \"gke\" {\n \n gce_pd_csi_driver = var.gce_pd_csi_driver\n filestore_csi_driver = var.filestore_csi_driver\n+ gcs_fuse_csi_driver = var.gcs_fuse_csi_driver\n \n notification_config_topic = var.notification_config_topic\n \n---\nmodules/safer-cluster-update-variant/metadata.display.yaml\n@@ -127,6 +127,9 @@ spec:\n gce_pd_csi_driver:\n name: gce_pd_csi_driver\n title: Gce Pd Csi Driver\n+ gcs_fuse_csi_driver:\n+ name: gcs_fuse_csi_driver\n+ title: Gcs Fuse Csi Driver\n gke_backup_agent_config:\n name: gke_backup_agent_config\n title: Gke Backup Agent Config\n---\nmodules/safer-cluster-update-variant/metadata.yaml\n@@ -422,6 +422,10 @@ spec:\n description: The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes\n varType: bool\n defaultValue: false\n+ - name: gcs_fuse_csi_driver\n+ description: Whether GCE FUSE CSI driver is enabled for this cluster.\n+ varType: bool\n+ defaultValue: false\n - name: add_cluster_firewall_rules\n description: Create additional firewall rules\n varType: bool\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -464,6 +464,12 @@ variable \"filestore_csi_driver\" {\n default = false\n }\n \n+variable \"gcs_fuse_csi_driver\" {\n+ type = bool\n+ description = \"Whether GCE FUSE CSI driver is enabled for this cluster.\"\n+ default = false\n+}\n+\n variable \"add_cluster_firewall_rules\" {\n type = bool\n description = \"Create additional firewall rules\"\n---\nmodules/safer-cluster/README.md\n@@ -234,6 +234,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | firewall\\_priority | Priority rule for firewall rules | `number` | `1000` | no |\n | gateway\\_api\\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |\n | gce\\_pd\\_csi\\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |\n+| gcs\\_fuse\\_csi\\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |\n | gke\\_backup\\_agent\\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |\n | grant\\_registry\\_access | Grants created cluster-specific service account storage.objectViewer role. | `bool` | `true` | no |\n | horizontal\\_pod\\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -204,6 +204,7 @@ module \"gke\" {\n \n gce_pd_csi_driver = var.gce_pd_csi_driver\n filestore_csi_driver = var.filestore_csi_driver\n+ gcs_fuse_csi_driver = var.gcs_fuse_csi_driver\n \n notification_config_topic = var.notification_config_topic\n \n---\nmodules/safer-cluster/metadata.display.yaml\n@@ -127,6 +127,9 @@ spec:\n gce_pd_csi_driver:\n name: gce_pd_csi_driver\n title: Gce Pd Csi Driver\n+ gcs_fuse_csi_driver:\n+ name: gcs_fuse_csi_driver\n+ title: Gcs Fuse Csi Driver\n gke_backup_agent_config:\n name: gke_backup_agent_config\n title: Gke Backup Agent Config\n---\nmodules/safer-cluster/metadata.yaml\n@@ -422,6 +422,10 @@ spec:\n description: The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes\n varType: bool\n defaultValue: false\n+ - name: gcs_fuse_csi_driver\n+ description: Whether GCE FUSE CSI driver is enabled for this cluster.\n+ varType: bool\n+ defaultValue: false\n - name: add_cluster_firewall_rules\n description: Create additional firewall rules\n varType: bool\n---\nmodules/safer-cluster/variables.tf\n@@ -464,6 +464,12 @@ variable \"filestore_csi_driver\" {\n default = false\n }\n \n+variable \"gcs_fuse_csi_driver\" {\n+ type = bool\n+ description = \"Whether GCE FUSE CSI driver is enabled for this cluster.\"\n+ default = false\n+}\n+\n variable \"add_cluster_firewall_rules\" {\n type = bool\n description = \"Create additional firewall rules\"\n---\n\n\n---\n\nChoice D:\nautogen/safer-cluster/main.tf.tmpl\n@@ -208,6 +208,7 @@ module \"gke\" {\n \n gce_pd_csi_driver = var.gce_pd_csi_driver\n filestore_csi_driver = var.filestore_csi_driver\n+ gcs_fuse_csi_driver = var.gcs_fuse_csi_driver\n \n notification_config_topic = var.notification_config_topic\n \n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -464,6 +464,12 @@ variable \"filestore_csi_driver\" {\n default = false\n }\n \n+variable \"gcs_fuse_csi_driver\" {\n+ type = bool\n+ description = \"Whether GCE FUSE CSI driver is enabled for this cluster.\"\n+ default = false\n+}\n+\n variable \"add_cluster_firewall_rules\" {\n type = bool\n description = \"Create additional firewall rules\"\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -234,6 +234,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | firewall\\_priority | Priority rule for firewall rules | `number` | `1000` | no |\n | gateway\\_api\\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |\n | gce\\_pd\\_csi\\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |\n+| gcs\\_fuse\\_csi\\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |\n | gke\\_backup\\_agent\\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |\n | grant\\_registry\\_access | Grants created cluster-specific service account storage.objectViewer role. | `bool` | `true` | no |\n | horizontal\\_pod\\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -204,6 +204,7 @@ module \"gke\" {\n \n gce_pd_csi_driver = var.gce_pd_csi_driver\n filestore_csi_driver = var.filestore_csi_driver\n+ gcs_fuse_csi_driver = var.gcs_fuse_csi_driver\n \n notification_config_topic = var.notification_config_topic\n \n---\nmodules/safer-cluster-update-variant/metadata.display.yaml\n@@ -127,6 +127,9 @@ spec:\n gce_pd_csi_driver:\n name: gce_pd_csi_driver\n title: Gce Pd Csi Driver\n+ gcs_fuse_csi_driver:\n+ name: gcs_fuse_csi_driver\n+ title: Gcs Fuse Csi Driver\n gke_backup_agent_config:\n name: gke_backup_agent_config\n title: Gke Backup Agent Config\n---\nmodules/safer-cluster-update-variant/metadata.yaml\n@@ -422,6 +422,10 @@ spec:\n description: The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes\n varType: bool\n defaultValue: false\n+ - name: gcs_fuse_csi_driver\n+ description: Whether GCE FUSE CSI driver is enabled for this cluster.\n+ varType: bool\n+ defaultValue: false\n - name: add_cluster_firewall_rules\n description: Create additional firewall rules\n varType: bool\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -464,6 +464,12 @@ variable \"filestore_csi_driver\" {\n default = false\n }\n \n+variable \"gcs_fuse_csi_driver\" {\n+ type = bool\n+ description = \"Whether GCE FUSE CSI driver is enabled for this cluster.\"\n+ default = false\n+}\n+\n variable \"add_cluster_firewall_rules\" {\n type = bool\n description = \"Create additional firewall rules\"\n---\nmodules/safer-cluster/README.md\n@@ -234,6 +234,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | firewall\\_priority | Priority rule for firewall rules | `number` | `1000` | no |\n | gateway\\_api\\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |\n | gce\\_pd\\_csi\\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |\n+| gcs\\_fuse\\_csi\\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |\n | gke\\_backup\\_agent\\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` Whether no |\n | grant\\_registry\\_access | Grants created cluster-specific service account storage.objectViewer role. | `bool` | `true` | no |\n | horizontal\\_pod\\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -204,6 +204,7 @@ module \"gke\" {\n \n gce_pd_csi_driver = var.gce_pd_csi_driver\n filestore_csi_driver = var.filestore_csi_driver\n+ gcs_fuse_csi_driver = var.gcs_fuse_csi_driver\n \n notification_config_topic = var.notification_config_topic\n \n---\nmodules/safer-cluster/metadata.display.yaml\n@@ -127,6 +127,9 @@ spec:\n gce_pd_csi_driver:\n name: gce_pd_csi_driver\n title: Gce Pd Csi Driver\n+ gcs_fuse_csi_driver:\n+ name: gcs_fuse_csi_driver\n+ title: Gcs Fuse Csi Driver\n gke_backup_agent_config:\n name: gke_backup_agent_config\n title: Gke Backup Agent Config\n---\nmodules/safer-cluster/metadata.yaml\n@@ -422,6 +422,10 @@ spec:\n description: The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes\n varType: bool\n defaultValue: false\n+ - name: gcs_fuse_csi_driver\n+ description: Whether GCE FUSE CSI driver is enabled for this cluster.\n+ varType: bool\n+ defaultValue: false\n - name: add_cluster_firewall_rules\n description: Create additional firewall rules\n varType: bool\n---\nmodules/safer-cluster/variables.tf\n@@ -464,6 +464,12 @@ variable \"filestore_csi_driver\" {\n default = false\n }\n \n+variable \"gcs_fuse_csi_driver\" {\n+ type = bool\n+ description = \"Whether GCE FUSE CSI driver is enabled for this cluster.\"\n+ default = false\n+}\n+\n variable \"add_cluster_firewall_rules\" {\n type = bool\n description = \"Create additional firewall rules\"\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | toolchain | patch | `1.24.4` -> `1.24.5` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.24.5`](https://redirect.github.com/golang/go/compare/go1.24.4...go1.24.5)\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4yMy4yIiwidXBkYXRlZEluVmVyIjoiNDEuMjMuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n module 1.23.0\n \n-toolchain go1.24.4\n+toolchain go1.24.5\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -2,7 \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.24.4\n+toolchain go1.24.5\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module test/integration/go.mod\n@@ \n go 1.23.0\n \n-toolchain go1.24.4\n+toolchain go1.24.5\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.24.4\n+toolchain go1.24.5\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| nginx | kubernetes_pod | minor | `1.28.0` -> `1.29.0` |\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xNy4yIiwidXBkYXRlZEluVmVyIjoiNDEuMTcuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.28.0\"\n+ image \"kubernetes_pod\" \"nginx:1.29.0\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice B:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n \"nginx-example\" container {\n- image = \"nginx:1.28.0\"\n+ image = \"nginx:1.29.0\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice C:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.28.0\"\n+ image = \"nginx:1.29.0\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice D:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.28.0\"\n+ image = \"nginx:1.29.0\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThe `boot_disk_kms_key` field was (accidentally?) **beta cluster** gated in the `default-pool`.\r\n\r\nFixes: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2344\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -254,7 +254,7 @@ resource \"google_container_cluster\" \"primary\" {\n disable_l4_lb_firewall_reconciliation = var.disable_l4_lb_firewall_reconciliation\n \n enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy\n- \n+\n in_transit_encryption_config var.in_transit_encryption_config\n \n dynamic \"secret_manager_config\" {\n@@ -664,8 +664,8 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n \n- boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n {% endif %}\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n@@ -1253,7 +1253,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n content {\n hugepage_size_2m = try(coalesce(local.node_pools_hugepage_size_2m[each.value[\"name\"]], local.node_pools_hugepage_size_2m[\"all\"]), null)\n hugepage_size_1g = try(coalesce(local.node_pools_hugepage_size_1g[each.value[\"name\"]], local.node_pools_hugepage_size_1g[\"all\"]), null)\n- } \n+ }\n }\n }\n }\n---\ncluster.tf\n@@ -516,6 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n metadata = local.node_pools_metadata[\"all\"]\n \n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -516,6 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n metadata = local.node_pools_metadata[\"all\"]\n \n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n---\nmodules/private-cluster/cluster.tf\n@@ -516,6 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n metadata = local.node_pools_metadata[\"all\"]\n \n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -254,7 +254,7 @@ resource \"google_container_cluster\" \"primary\" {\n disable_l4_lb_firewall_reconciliation = var.disable_l4_lb_firewall_reconciliation\n \n enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy\n- \n+\n in_transit_encryption_config = var.in_transit_encryption_config\n \n dynamic \"secret_manager_config\" {\n@@ -664,8 +664,8 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n \n- boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n {% endif %}\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n@@ -1253,7 +1253,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n content {\n hugepage_size_2m = try(coalesce(local.node_pools_hugepage_size_2m[each.value[\"name\"]], local.node_pools_hugepage_size_2m[\"all\"]), null)\n hugepage_size_1g = try(coalesce(local.node_pools_hugepage_size_1g[each.value[\"name\"]], local.node_pools_hugepage_size_1g[\"all\"]), null)\n- = } \n+ }\n }\n }\n }\n---\ncluster.tf\n@@ -516,6 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n metadata = local.node_pools_metadata[\"all\"]\n \n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -516,6 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n metadata = local.node_pools_metadata[\"all\"]\n \n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n---\nmodules/private-cluster/cluster.tf\n@@ -516,6 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n metadata = local.node_pools_metadata[\"all\"]\n \n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -254,7 +254,7 @@ resource \"google_container_cluster\" \"primary\" {\n disable_l4_lb_firewall_reconciliation = var.disable_l4_lb_firewall_reconciliation\n \n enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy\n- \n+\n in_transit_encryption_config = var.in_transit_encryption_config\n \n dynamic \"secret_manager_config\" {\n@@ -664,8 +664,8 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n \n- boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n {% endif %}\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n@@ -1253,7 +1253,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n content {\n hugepage_size_2m = try(coalesce(local.node_pools_hugepage_size_2m[each.value[\"name\"]], local.node_pools_hugepage_size_2m[\"all\"]), null)\n hugepage_size_1g = try(coalesce(local.node_pools_hugepage_size_1g[each.value[\"name\"]], local.node_pools_hugepage_size_1g[\"all\"]), null)\n- } \n+ }\n }\n }\n }\n---\ncluster.tf\n@@ -516,6 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n metadata = local.node_pools_metadata[\"all\"]\n \n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -516,6 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n metadata = local.node_pools_metadata[\"all\"]\n \n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n---\nmodules/private-cluster/cluster.tf\n@@ -516,6 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n metadata = local.node_pools_metadata[\"all\"]\n \n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -254,7 +254,7 @@ resource \"google_container_cluster\" \"primary\" {\n disable_l4_lb_firewall_reconciliation = var.disable_l4_lb_firewall_reconciliation\n \n enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy\n- \n+\n in_transit_encryption_config = var.in_transit_encryption_config\n \n dynamic \"secret_manager_config\" {\n@@ -664,8 +664,8 @@ resource \"primary\" {\n }\n }\n \n- boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n {% endif %}\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n@@ -1253,7 +1253,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n content {\n hugepage_size_2m = try(coalesce(local.node_pools_hugepage_size_2m[each.value[\"name\"]], local.node_pools_hugepage_size_2m[\"all\"]), null)\n hugepage_size_1g = try(coalesce(local.node_pools_hugepage_size_1g[each.value[\"name\"]], local.node_pools_hugepage_size_1g[\"all\"]), null)\n- } \n+ }\n }\n }\n }\n---\ncluster.tf\n@@ -516,6 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n metadata = local.node_pools_metadata[\"all\"]\n \n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -516,6 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n metadata = local.node_pools_metadata[\"all\"]\n \n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n---\nmodules/private-cluster/cluster.tf\n@@ -516,6 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n metadata = local.node_pools_metadata[\"all\"]\n \n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n \n storage_pools = lookup(var.node_pools[0], \"storage_pools\", null) != null ? [var.node_pools[0].storage_pools] : []\n \n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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/kubernetes-engine/google](https://registry.terraform.io/modules/terraform-google-modules/kubernetes-engine/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine)) | module | major | `~> 36.0` -> `~> 37.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-kubernetes-engine (terraform-google-modules/kubernetes-engine/google)</summary>\n\n### [`v37.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/blob/HEAD/CHANGELOG.md#3700-2025-06-17)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.3.0...v37.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **autopilot:** remove ip-masq configmap ([#​2364](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2364))\n- **TPG>=6.38:** bump hpa\\_profile to GA ([#​2362](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2362))\n- **TPG>=6.36:** add storage\\_pools support ([#​2326](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2326))\n- **TPG>=6.33:** allow update in-place for `enable_gvnic` and `enable_confidential_nodes` ([#​2359](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2359))\n- **TPG>=6.28:** add support for disable\\_l4\\_lb\\_firewall\\_reconciliation ([#​2338](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2338))\n- dns\\_allow\\_external\\_traffic on private clusters ([#​2334](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2334))\n- **TPG>=6.27:** add support for HPA profile + logs ([#​2323](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2323))\n\n##### Features\n\n- add JOBSET to monitoring\\_enabled\\_components ([#​2336](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2336)) ([e55529d](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/e55529db6df48075887b997702fdc993fc2406ee))\n- add local\\_ssd\\_encryption\\_mode ([#​2328](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2328)) ([95171f6](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/95171f6f2b3c9ddd8e77dbd35a4b4741af2eef42))\n- add new kubelet params ([#​2337](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2337)) ([17e1c71](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/17e1c71554f1a2658cac1efe845567f06c2c2462))\n- add support for hugepages\\_config ([#​2223](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2223)) ([cf71718](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/cf717187dd54564fc384adc401771848c26cfb0d))\n- add tpu\\_topology and policy\\_name args in placement\\_policy ([#​2363](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2363)) ([8fdfd20](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/8fdfd20b572528a635d91d0db2971213bdc29942))\n- **TPG>=6.27:** add support for HPA profile + logs ([#​2323](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2323)) ([8e33d19](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/8e33d1952706137849b79f7b84cd8d3da85cec88))\n- **TPG>=6.28:** add support for disable\\_l4\\_lb\\_firewall\\_reconciliation ([#​2338](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2338)) ([132a981](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/132a9819c75f2a2cf7d2835098f96732cb7f8ac6))\n- **TPG>=6.33:** allow update in-place for `enable_gvnic` and `enable_confidential_nodes` ([#​2359](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2359)) ([380fa36](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/380fa36ab12ca9caf7937ab4722a98a0b6175128))\n- **TPG>=6.36:** add storage\\_pools support ([#​2326](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2326)) ([85efdc1](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/85efdc1695812ddf077074db959d35db6501a00c))\n- **TPG>=6.38:** bump hpa\\_profile to GA ([#​2362](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2362)) ([c80e88f](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/c80e88f2bc27882aa0448b6d4aa50492341d7265))\n\n##### Bug Fixes\n\n- **autopilot:** remove ip-masq configmap ([#​2364](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2364)) ([9dce230](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/9dce230539a2c2ddee452489d604df34006a625f))\n- dns\\_allow\\_external\\_traffic on private clusters ([#​2334](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2334)) ([1c6ff12](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/1c6ff12b9c01fe77633bae942e9c8ff8ff38f17a))\n- Invalid index for `google_container_cluster.primary.private_cluster_config[0]` ([#​2354](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2354)) ([552b3f4](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/552b3f46d861244f076159e7e16be9f80ba2d6b9))\n- support for SHORT\\_LIVED strategy ([#​2352](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2352)) ([f3417b1](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/f3417b125b537797f979028252a3b9555810e7fb))\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC42Mi4xIiwidXBkYXRlZEluVmVyIjoiNDAuNjIuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\nexamples/confidential_autopilot_private/main.tf\n@@ -54,7 +54,7 @@ resource \"google_kms_crypto_key_iam_member\" \"main\" {\n \n module \"gke\" {\n source = examples/confidential_autopilot_private/main.tf\n@@ version = \"~> 36.0\"\n+ version = \"~> 37.0\"\n \n project_id = var.project_id\n name = \"${local.cluster_type}-cluster\"\n---\n\n\n---\n\nChoice B:\nexamples/confidential_autopilot_private/main.tf\n@@ -54,7 +54,7 @@ resource \"google_kms_crypto_key_iam_member\" \"main\" {\n \n module \"gke\" {\n source = \"terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster\"\n- version = \"~> 36.0\"\n+ version = \"~> 37.0\"\n \n project_id = var.project_id\n name @@ = \"${local.cluster_type}-cluster\"\n---\n\n\n---\n\nChoice C:\nexamples/confidential_autopilot_private/main.tf\n@@ -54,7 +54,7 @@ resource \"google_kms_crypto_key_iam_member\" \"main\" {\n \n module \"gke\" {\n source = \"terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster\"\n- version = \"~> 36.0\"\n+ version = \"~> 37.0\"\n \n project_id = var.project_id\n name = \"${local.cluster_type}-cluster\"\n---\n\n\n---\n\nChoice D:\nexamples/confidential_autopilot_private/main.tf\n@@ -54,7 +54,7 @@ resource \"google_kms_crypto_key_iam_member\" \"main\" {\n \n module \"gke\" {\n source = \"terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster\"\n- version = \"~> 36.0\"\n+ version = \"~> 37.0\"\n \n project_id = var.project_id\n name = \"${local.cluster_type}-cluster\"\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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/network/google](https://registry.terraform.io/modules/terraform-google-modules/network/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-network)) | module | major | `~> 10.0` -> `~> 11.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-network (terraform-google-modules/network/google)</summary>\n\n### [`v11.1.1`](https://redirect.github.com/terraform-google-modules/terraform-google-network/blob/HEAD/CHANGELOG.md#1111-2025-05-27)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-network/compare/v11.1.0...v11.1.1)\n\n##### Bug Fixes\n\n- default value for bgp\\_inter\\_region\\_cost and bgp\\_best\\_path\\_selection\\_mode ([#​616](https://redirect.github.com/terraform-google-modules/terraform-google-network/issues/616)) ([1bb1b32](https://redirect.github.com/terraform-google-modules/terraform-google-network/commit/1bb1b32a72583122b18cebe417b2c0b4d253b2aa))\n\n### [`v11.1.0`](https://redirect.github.com/terraform-google-modules/terraform-google-network/blob/HEAD/CHANGELOG.md#1110-2025-05-08)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-network/compare/v11.0.0...v11.1.0)\n\n##### Features\n\n- added bgp\\_best\\_path\\_selection\\_mode bgp\\_always\\_compare\\_med bgp\\_inter\\_region\\_cost in VPC module ([#​610](https://redirect.github.com/terraform-google-modules/terraform-google-network/issues/610)) ([aab974a](https://redirect.github.com/terraform-google-modules/terraform-google-network/commit/aab974aa485132f97edab4e404108e874baaa0a2))\n\n### [`v11.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-network/blob/HEAD/CHANGELOG.md#1100-2025-04-23)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-network/compare/v10.0.0...v11.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TPG>6.28:** added support for packet mirroring firewall policy rule, src\\_networks, src\\_network\\_scope and dest\\_network\\_scope ([#​596](https://redirect.github.com/terraform-google-modules/terraform-google-network/issues/596))\n\n##### Features\n\n- added security profile rule support in network firewall policy ([#​602](https://redirect.github.com/terraform-google-modules/terraform-google-network/issues/602)) ([339e6f6](https://redirect.github.com/terraform-google-modules/terraform-google-network/commit/339e6f6013d5d7b749f4e8eb18410dc59f1d6ab3))\n- **TPG>6.28:** added support for packet mirroring firewall policy rule, src\\_networks, src\\_network\\_scope and dest\\_network\\_scope ([#​596](https://redirect.github.com/terraform-google-modules/terraform-google-network/issues/596)) ([3ac6496](https://redirect.github.com/terraform-google-modules/terraform-google-network/commit/3ac64964bd2fd7f9f4f763d6f5152e9456f2e175))\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC42Mi4xIiwidXBkYXRlZEluVmVyIjoiNDAuNjIuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\nexamples/confidential_autopilot_private/network.tf\n@@ -16,7 +16,7 @@\n \n module \"gcp-network\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ project_id = \"~> 11.0\"\n \n project_id = var.project_id\n network_name = local.network_name\n---\n\n\n---\n\nChoice B:\nexamples/confidential_autopilot_private/network.tf\n@@ -16,7 +16,7 @@\n \n module \"gcp-network\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = var.project_id\n network_name = local.network_name\n---\n\n\n---\n\nChoice C:\nexamples/confidential_autopilot_private/network.tf\n@@ -16,7 +16,7 @@\n \n module \"gcp-network\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = var.project_id\n network_name = local.network_name\n---\n\n\n---\n\nChoice D:\nexamples/confidential_autopilot_private/network.tf\n@@ -16,7 +16,7 @@\n \n module \"gcp-network\" source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = var.project_id\n network_name = local.network_name\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence | Type | Update |\n|---|---|---|---|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://redirect.github.com/gruntwork-io/terratest) | `v0.49.0` -> `v0.50.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | require | minor |\n| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | `1.24.3` -> `1.24.4` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | toolchain | patch |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.50.0`](https://redirect.github.com/gruntwork-io/terratest/releases/tag/v0.50.0)\n\n[Compare Source](https://redirect.github.com/gruntwork-io/terratest/compare/v0.49.0...v0.50.0)\n\n#### What's Changed\n\n- add cronjob by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1553](https://redirect.github.com/gruntwork-io/terratest/pull/1553)\n- fix ResourceGroupExists by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1552](https://redirect.github.com/gruntwork-io/terratest/pull/1552)\n- allow GOOGLE_OAUTH_ACCESS_TOKEN by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1555](https://redirect.github.com/gruntwork-io/terratest/pull/1555)\n- Adjust warning patterns by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1550](https://redirect.github.com/gruntwork-io/terratest/pull/1550)\n- chore: Offboarding Levko by [@​yhakbar](https://redirect.github.com/yhakbar) in [https://github.com/gruntwork-io/terratest/pull/1558](https://redirect.github.com/gruntwork-io/terratest/pull/1558)\n- fix: Respect port selection by name by services in ForwardPortE by [@​s-diez](https://redirect.github.com/s-diez) in [https://github.com/gruntwork-io/terratest/pull/1557](https://redirect.github.com/gruntwork-io/terratest/pull/1557)\n- fix: Helm example deployment test by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1559](https://redirect.github.com/gruntwork-io/terratest/pull/1559)\n- Updated the subnet struct and corresponding function to fetch the subnet CIDR range by [@​Atchuthmullapudi](https://redirect.github.com/Atchuthmullapudi) in [https://github.com/gruntwork-io/terratest/pull/1561](https://redirect.github.com/gruntwork-io/terratest/pull/1561)\n- Implement support for `terragrunt stack init` by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1560](https://redirect.github.com/gruntwork-io/terratest/pull/1560)\n\n#### New Contributors\n\n- [@​Atchuthmullapudi](https://redirect.github.com/Atchuthmullapudi) made their first contribution in [https://github.com/gruntwork-io/terratest/pull/1561](https://redirect.github.com/gruntwork-io/terratest/pull/1561)\n\n**Full Changelog**: https://github.com/gruntwork-io/terratest/compare/v0.49.0...v0.50.0\n\n</details>\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.24.4`](https://redirect.github.com/golang/go/compare/go1.24.3...go1.24.4)\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👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired.\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC40OC41IiwidXBkYXRlZEluVmVyIjoiNDAuNTAuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -2,11 +2,11 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.24.3\n+toolchain go1.24.4\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7\n-\tgithub.com/gruntwork-io/terratest v0.49.0\n+\tgithub.com/gruntwork-io/terratest v0.50.0\n \tgithub.com/hashicorp/terraform-json v0.25.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n---\ntest/integration/go.sum\n@@ -136,8 +136,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm\n github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.49.0 h1:GurfpHEOEr8vntB77QcxDh+P7aiQRUgPFdgb6q9PuWI=\n-github.com/gruntwork-io/terratest h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n h1:/+dfGio9NqUpvvukuPo29B8zy6U5FYJn9PdmvwztK4A=\n+github.com/gruntwork-io/terratest v0.50.0 h1:AbBJ7IRCpLZ9H4HBrjeoWESITv8nLjN6/f1riMNcAsw=\n+github.com/gruntwork-io/terratest v0.50.0/go.mod h1:see0lbKvAqz6rvzvN2wyfuFQQG4PWcAb2yHulF6B2q4=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -2,11 +2,11 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.24.3\n+toolchain go1.24.4\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7\n-\tgithub.com/gruntwork-io/terratest v0.49.0\n+\tgithub.com/gruntwork-io/terratest v0.50.0\n \tgithub.com/hashicorp/terraform-json v0.25.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n---\ntest/integration/go.sum\n@@ -136,8 +136,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm\n github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.49.0 h1:GurfpHEOEr8vntB77QcxDh+P7aiQRUgPFdgb6q9PuWI=\n-github.com/gruntwork-io/terratest v0.49.0/go.mod h1:/+dfGio9NqUpvvukuPo29B8zy6U5FYJn9PdmvwztK4A=\n+github.com/gruntwork-io/terratest v0.50.0 h1:AbBJ7IRCpLZ9H4HBrjeoWESITv8nLjN6/f1riMNcAsw=\n+github.com/gruntwork-io/terratest v0.50.0/go.mod h1:see0lbKvAqz6rvzvN2wyfuFQQG4PWcAb2yHulF6B2q4=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod github.com/gorilla/websocket\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -2,11 +2,11 @@ module v0.49.0\n+\tgithub.com/gruntwork-io/terratest \n go 1.23.0\n \n-toolchain go1.24.3\n+toolchain go1.24.4\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7\n-\tgithub.com/gruntwork-io/terratest v0.49.0\n+\tgithub.com/gruntwork-io/terratest v0.50.0\n \tgithub.com/hashicorp/terraform-json v0.25.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n---\ntest/integration/go.sum\n@@ -136,8 +136,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm\n github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.49.0 h1:GurfpHEOEr8vntB77QcxDh+P7aiQRUgPFdgb6q9PuWI=\n-github.com/gruntwork-io/terratest v0.49.0/go.mod h1:/+dfGio9NqUpvvukuPo29B8zy6U5FYJn9PdmvwztK4A=\n+github.com/gruntwork-io/terratest v0.50.0 h1:AbBJ7IRCpLZ9H4HBrjeoWESITv8nLjN6/f1riMNcAsw=\n+github.com/gruntwork-io/terratest v0.50.0/go.mod h1:see0lbKvAqz6rvzvN2wyfuFQQG4PWcAb2yHulF6B2q4=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -2,11 +2,11 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.24.3\n+toolchain go1.24.4\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7\n-\tgithub.com/gruntwork-io/terratest v0.49.0\n+\tgithub.com/gruntwork-io/terratest v0.50.0\n \tgithub.com/hashicorp/terraform-json v0.25.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n---\ntest/integration/go.sum\n@@ -136,8 +136,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm\n github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.49.0 h1:GurfpHEOEr8vntB77QcxDh+P7aiQRUgPFdgb6q9PuWI=\n-github.com/gruntwork-io/terratest v0.49.0/go.mod h1:/+dfGio9NqUpvvukuPo29B8zy6U5FYJn9PdmvwztK4A=\n+github.com/gruntwork-io/terratest v0.50.0 h1:AbBJ7IRCpLZ9H4HBrjeoWESITv8nLjN6/f1riMNcAsw=\n+github.com/gruntwork-io/terratest v0.50.0/go.mod h1:see0lbKvAqz6rvzvN2wyfuFQQG4PWcAb2yHulF6B2q4=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://redirect.github.com/GoogleCloudPlatform/cloud-foundation-toolkit) | `v0.17.6` -> `v0.17.7` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC40MC4zIiwidXBkYXRlZEluVmVyIjoiNDAuNDAuMyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.23.0\n toolchain go1.24.3\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7\n \tgithub.com/gruntwork-io/terratest v0.49.0\n \tgithub.com/hashicorp/terraform-json v0.25.0\n \tgithub.com/stretchr/testify v1.10.0\n@@ -81,7 +81,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.7.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.22.0 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d // indirect\n \tgithub.com/jackc/pgpassfile v1.0.0 // indirect\n \tgithub.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect\n \tgithub.com/jackc/pgx/v5 v5.7.1 // indirect\n@@ -117,7 +117,7 @@ require (\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.16.2 // indirect\n \tgolang.org/x/crypto v0.36.0 // indirect\n-\tgolang.org/x/mod v0.23.0 // indirect\n+\tgolang.org/x/mod v0.24.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---\ntest/integration/go.sum\n@@ -1,7 +1,7 @@\n filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=\n filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6 h1:ZuWhmUXY/co2jqEUYYosTlAruqzATzrYQ4IV5VKiKNM=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6/go.mod h1:UX+iYMTzZ7Ik6N5rD8U32x7QwKaGyG/aAflWWDaHMDc=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7 h1:vVlsDeV++LGlU+b11CbE8wHB7Jo62DJ+qqlSzyPfN5A=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7/go.mod h1:Z431ZwEO0JJI6ysJMAEl1PJ1IUwQDljQeQx/0e96j5E=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n@@ -123,8 +123,6 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6\n github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=\n github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=\n github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=\n-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=\n github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=\n github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=\n@@ -157,10 +155,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M=\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 h1:6zYoI+NGpRPo0UjbnJfmqqTFcTEKvbv77h0ZcgeLXJs=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n-github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n-github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d h1:OtLDHysmVW+zEeWF7VWRvGALkOgws3cmDd2QI1xAAhw=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=\n github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n@@ -265,8 +261,6 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT\n github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=\n github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n-github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0=\n-github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n@@ -278,8 +272,8 @@ 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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n-golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n-golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=\n+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=\n golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.23.0\n toolchain go1.24.3\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7\n \tgithub.com/gruntwork-io/terratest v0.49.0\n \tgithub.com/hashicorp/terraform-json v0.25.0\n \tgithub.com/stretchr/testify v1.10.0\n@@ -81,7 +81,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.7.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.22.0 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect indirect\n // indirect\n \tgithub.com/jackc/pgpassfile v1.0.0 // indirect\n \tgithub.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect\n \tgithub.com/jackc/pgx/v5 v5.7.1 // indirect\n@@ -117,7 +117,7 @@ require (\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.16.2 // indirect\n \tgolang.org/x/crypto v0.36.0 // indirect\n-\tgolang.org/x/mod v0.23.0 // indirect\n+\tgolang.org/x/mod v0.24.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---\ntest/integration/go.sum\n@@ -1,7 +1,7 @@\n filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=\n filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6 h1:ZuWhmUXY/co2jqEUYYosTlAruqzATzrYQ4IV5VKiKNM=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6/go.mod h1:UX+iYMTzZ7Ik6N5rD8U32x7QwKaGyG/aAflWWDaHMDc=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7 h1:vVlsDeV++LGlU+b11CbE8wHB7Jo62DJ+qqlSzyPfN5A=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7/go.mod h1:Z431ZwEO0JJI6ysJMAEl1PJ1IUwQDljQeQx/0e96j5E=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n@@ -123,8 +123,6 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6\n github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=\n github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=\n github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=\n-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=\n github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=\n github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=\n@@ -157,10 +155,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M=\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 h1:6zYoI+NGpRPo0UjbnJfmqqTFcTEKvbv77h0ZcgeLXJs=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n-github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n-github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d h1:OtLDHysmVW+zEeWF7VWRvGALkOgws3cmDd2QI1xAAhw=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=\n github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n@@ -265,8 +261,6 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT\n github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=\n github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n-github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0=\n-github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n@@ -278,8 +272,8 @@ 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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n-golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n-golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=\n+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=\n golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.23.0\n toolchain go1.24.3\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7\n \tgithub.com/gruntwork-io/terratest v0.49.0\n \tgithub.com/hashicorp/terraform-json v0.25.0\n \tgithub.com/stretchr/testify v1.10.0\n@@ -81,7 +81,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.7.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.22.0 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d // indirect\n \tgithub.com/jackc/pgpassfile v1.0.0 // indirect\n \tgithub.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect\n \tgithub.com/jackc/pgx/v5 v5.7.1 // indirect\n@@ -117,7 +117,7 @@ require (\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.16.2 // indirect\n \tgolang.org/x/crypto v0.36.0 // indirect\n-\tgolang.org/x/mod v0.23.0 // indirect\n+\tgolang.org/x/mod v0.24.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 // v0.0.0-20201216005158-039620a65673 -1,7 +1,7 @@\n filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=\n filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6 h1:ZuWhmUXY/co2jqEUYYosTlAruqzATzrYQ4IV5VKiKNM=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6/go.mod h1:UX+iYMTzZ7Ik6N5rD8U32x7QwKaGyG/aAflWWDaHMDc=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7 h1:vVlsDeV++LGlU+b11CbE8wHB7Jo62DJ+qqlSzyPfN5A=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7/go.mod h1:Z431ZwEO0JJI6ysJMAEl1PJ1IUwQDljQeQx/0e96j5E=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n@@ -123,8 +123,6 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6\n github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=\n github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=\n github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=\n-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=\n github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=\n github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=\n@@ -157,10 +155,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M=\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 h1:6zYoI+NGpRPo0UjbnJfmqqTFcTEKvbv77h0ZcgeLXJs=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n-github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n-github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d h1:OtLDHysmVW+zEeWF7VWRvGALkOgws3cmDd2QI1xAAhw=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=\n github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n@@ -265,8 +261,6 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT\n github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=\n github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n-github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0=\n-github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n@@ -278,8 +272,8 @@ 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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n-golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n-golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=\n+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=\n golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.23.0\n toolchain go1.24.3\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7\n \tgithub.com/gruntwork-io/terratest v0.49.0\n \tgithub.com/hashicorp/terraform-json v0.25.0\n \tgithub.com/stretchr/testify v1.10.0\n@@ -81,7 +81,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.7.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.22.0 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d // indirect\n \tgithub.com/jackc/pgpassfile v1.0.0 // indirect\n \tgithub.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect\n \tgithub.com/jackc/pgx/v5 v5.7.1 // indirect\n@@ -117,7 +117,7 @@ require (\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.16.2 // indirect\n \tgolang.org/x/crypto v0.36.0 // indirect\n-\tgolang.org/x/mod v0.23.0 // indirect\n+\tgolang.org/x/mod v0.24.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---\ntest/integration/go.sum\n@@ -1,7 +1,7 @@\n filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=\n filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6 h1:ZuWhmUXY/co2jqEUYYosTlAruqzATzrYQ4IV5VKiKNM=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6/go.mod h1:UX+iYMTzZ7Ik6N5rD8U32x7QwKaGyG/aAflWWDaHMDc=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7 h1:vVlsDeV++LGlU+b11CbE8wHB7Jo62DJ+qqlSzyPfN5A=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7/go.mod h1:Z431ZwEO0JJI6ysJMAEl1PJ1IUwQDljQeQx/0e96j5E=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n github.com/alexflint/go-filemutex v1.3.0 (\n -123,8 +123,6 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6\n github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=\n github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=\n github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=\n-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=\n github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=\n github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=\n@@ -157,10 +155,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M=\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 h1:6zYoI+NGpRPo0UjbnJfmqqTFcTEKvbv77h0ZcgeLXJs=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n-github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n-github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d h1:OtLDHysmVW+zEeWF7VWRvGALkOgws3cmDd2QI1xAAhw=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=\n github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n@@ -265,8 +261,6 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT\n github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=\n github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n-github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0=\n-github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n@@ -278,8 +272,8 @@ 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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n-golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n-golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=\n+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=\n golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| cft/developer-tools | | minor | `1.24` -> `1.25` |\n| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | toolchain | minor | `1.23.9` -> `1.24.3` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.24.3`](https://redirect.github.com/golang/go/compare/go1.24.2...go1.24.3)\n\n### [`v1.24.2`](https://redirect.github.com/golang/go/compare/go1.24.1...go1.24.2)\n\n### [`v1.24.1`](https://redirect.github.com/golang/go/compare/go1.24.0...go1.24.1)\n\n### [`v1.24.0`](https://redirect.github.com/golang/go/compare/go1.23.9...go1.24.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👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired.\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC4zMy42IiwidXBkYXRlZEluVmVyIjoiNDAuMzMuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\nMakefile\n@@ -18,7 +18,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\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n DOCKER_BIN ?= docker\n---\nbuild/int.cloudbuild.yaml\n@@ -486,6 +486,6 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.24'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.25'\n options:\n machineType: 'E2_HIGHCPU_8'\n---\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ \n-toolchain github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.9\n+toolchain go1.24.3\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n\nChoice B:\nMakefile\n@@ -18,7 +18,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\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n DOCKER_BIN ?= docker\n---\nbuild/int.cloudbuild.yaml\n@@ -486,6 +486,6 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.24'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.25'\n options:\n machineType: 'E2_HIGHCPU_8'\n---\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.9\n+toolchain go1.24.3\n \n require /usr/bin/env \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n\nChoice C:\nMakefile\n@@ -18,7 +18,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\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n DOCKER_BIN ?= docker\n---\nbuild/int.cloudbuild.yaml\n@@ -486,6 +486,6 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.24'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.25'\n options:\n machineType: 'E2_HIGHCPU_8'\n---\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.9\n+toolchain go1.24.3\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n\nChoice D:\nMakefile\n@@ -18,7 +18,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\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n DOCKER_BIN ?= docker\n---\nbuild/int.cloudbuild.yaml\n@@ \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test +486,6 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.24'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.25'\n options:\n machineType: 'E2_HIGHCPU_8'\n---\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.9\n+toolchain go1.24.3\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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 | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|---|---|\n| cft/developer-tools | | minor | `1.23` -> `1.24` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n| [github.com/hashicorp/terraform-json](https://redirect.github.com/hashicorp/terraform-json) | require | minor | `v0.24.0` -> `v0.25.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>hashicorp/terraform-json (github.com/hashicorp/terraform-json)</summary>\n\n### [`v0.25.0`](https://redirect.github.com/hashicorp/terraform-json/releases/tag/v0.25.0)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-json/compare/v0.24.0...v0.25.0)\n\nENHANCEMENTS:\n\n- Add identity fields to plan struct by [@​dbanck](https://redirect.github.com/dbanck) in [https://github.com/hashicorp/terraform-json/pull/158](https://redirect.github.com/hashicorp/terraform-json/pull/158)\n- Update state and provider JSON with identity fields by [@​dbanck](https://redirect.github.com/dbanck) in [https://github.com/hashicorp/terraform-json/pull/155](https://redirect.github.com/hashicorp/terraform-json/pull/155)\n\nINTERNAL:\n\n- build(deps): Bump workflows to latest trusted versions by [@​hashicorp-tsccr](https://redirect.github.com/hashicorp-tsccr) in [https://github.com/hashicorp/terraform-json/pull/149](https://redirect.github.com/hashicorp/terraform-json/pull/149)\n- Bump github.com/zclconf/go-cty from 1.15.1 to 1.16.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/hashicorp/terraform-json/pull/150](https://redirect.github.com/hashicorp/terraform-json/pull/150)\n- Bump github.com/zclconf/go-cty from 1.16.0 to 1.16.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/hashicorp/terraform-json/pull/151](https://redirect.github.com/hashicorp/terraform-json/pull/151)\n- Bump github.com/zclconf/go-cty from 1.16.1 to 1.16.2 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/hashicorp/terraform-json/pull/152](https://redirect.github.com/hashicorp/terraform-json/pull/152)\n- build(deps): Bump workflows to latest trusted versions by [@​hashicorp-tsccr](https://redirect.github.com/hashicorp-tsccr) in [https://github.com/hashicorp/terraform-json/pull/153](https://redirect.github.com/hashicorp/terraform-json/pull/153)\n- Bump github.com/google/go-cmp from 0.6.0 to 0.7.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/hashicorp/terraform-json/pull/154](https://redirect.github.com/hashicorp/terraform-json/pull/154)\n- build(deps): Bump workflows to latest trusted versions by [@​hashicorp-tsccr](https://redirect.github.com/hashicorp-tsccr) in [https://github.com/hashicorp/terraform-json/pull/156](https://redirect.github.com/hashicorp/terraform-json/pull/156)\n- Update owner field in catalog-info.yaml by [@​imakewebthings](https://redirect.github.com/imakewebthings) in [https://github.com/hashicorp/terraform-json/pull/157](https://redirect.github.com/hashicorp/terraform-json/pull/157)\n- Update CODEOWNERS by [@​austinvalle](https://redirect.github.com/austinvalle) in [https://github.com/hashicorp/terraform-json/pull/159](https://redirect.github.com/hashicorp/terraform-json/pull/159)\n- github: Use Dependabot to keep Actions updated by [@​xiehan](https://redirect.github.com/xiehan) in [https://github.com/hashicorp/terraform-json/pull/160](https://redirect.github.com/hashicorp/terraform-json/pull/160)\n\n**Full Changelog**: https://github.com/hashicorp/terraform-json/compare/v0.24.0...v0.25.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👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired.\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC4xNi4wIiwidXBkYXRlZEluVmVyIjoiNDAuMTYuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\nMakefile\n@@ -18,7 +18,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.24\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n DOCKER_BIN ?= docker\n---\nbuild/int.cloudbuild.yaml\n@@ -486,6 +486,6 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.24'\n options:\n machineType: 'E2_HIGHCPU_8'\n---\ntest/integration/go.mod\n@@ -7,7 +7,7 @@ toolchain go1.23.9\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n \tgithub.com/gruntwork-io/terratest v0.49.0\n-\tgithub.com/hashicorp/terraform-json v0.24.0\n+\tgithub.com/hashicorp/terraform-json v0.25.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n@@ -68,7 +68,7 @@ require (\n \tgithub.com/gogo/protobuf v1.3.2 // 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/go-cmp v0.7.0 // indirect\n \tgithub.com/google/gofuzz v1.2.0 // indirect\n \tgithub.com/google/uuid v1.6.0 // indirect\n \tgithub.com/gorilla/websocket v1.5.0 // indirect\n@@ -115,7 +115,7 @@ require (\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n-\tgithub.com/zclconf/go-cty v1.15.1 // indirect\n+\tgithub.com/zclconf/go-cty v1.16.2 // 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---\ntest/integration/go.sum\n@@ -125,6 +125,8 @@ github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcb\n github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=\n github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=\n+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=\n github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=\n github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=\n github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=\n@@ -159,6 +161,8 @@ github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4\n github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n+github.com/hashicorp/terraform-json // h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=\n+github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=\n github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=\n@@ -263,6 +267,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0=\n github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n+github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n+github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\n---\n\n\n---\n\nChoice B:\nMakefile\n@@ -18,7 +18,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.24\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n DOCKER_BIN ?= docker\n---\nbuild/int.cloudbuild.yaml\n@@ -486,6 +486,6 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.24'\n options:\n machineType: 'E2_HIGHCPU_8'\n---\ntest/integration/go.mod\n@@ -7,7 +7,7 @@ toolchain go1.23.9\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n \tgithub.com/gruntwork-io/terratest v0.49.0\n-\tgithub.com/hashicorp/terraform-json v0.24.0\n+\tgithub.com/hashicorp/terraform-json v0.25.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n@@ -68,7 +68,7 @@ require (\n \tgithub.com/gogo/protobuf v1.3.2 // 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/go-cmp v0.7.0 // indirect\n \tgithub.com/google/gofuzz v1.2.0 // indirect\n \tgithub.com/google/uuid v1.6.0 // indirect\n \tgithub.com/gorilla/websocket v1.5.0 // indirect\n@@ -115,7 +115,7 @@ require (\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n-\tgithub.com/zclconf/go-cty v1.15.1 // indirect\n+\tgithub.com/zclconf/go-cty v1.16.2 // 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---\ntest/integration/go.sum\n@@ -125,6 +125,8 @@ github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcb\n github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=\n github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=\n+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=\n github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=\n github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=\n github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=\n@@ -159,6 +161,8 @@ github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4\n github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n+github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=\n+github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=\n github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=\n@@ -263,6 +267,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0=\n github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n+github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n+github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\n---\n\n\n---\n\nChoice C:\nMakefile\n@@ -18,7 +18,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.24\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n DOCKER_BIN ?= docker\n---\nbuild/int.cloudbuild.yaml\n@@ -486,6 +486,6 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.24'\n options:\n DOCKER_IMAGE_DEVELOPER_TOOLS machineType: 'E2_HIGHCPU_8'\n---\ntest/integration/go.mod\n@@ -7,7 +7,7 @@ toolchain go1.23.9\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n \tgithub.com/gruntwork-io/terratest v0.49.0\n-\tgithub.com/hashicorp/terraform-json v0.24.0\n+\tgithub.com/hashicorp/terraform-json v0.25.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n@@ -68,7 +68,7 @@ require (\n \tgithub.com/gogo/protobuf v1.3.2 // 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/go-cmp v0.7.0 // indirect\n \tgithub.com/google/gofuzz v1.2.0 // indirect\n \tgithub.com/google/uuid v1.6.0 // indirect\n \tgithub.com/gorilla/websocket v1.5.0 // indirect\n@@ -115,7 +115,7 @@ require (\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n-\tgithub.com/zclconf/go-cty v1.15.1 // indirect\n+\tgithub.com/zclconf/go-cty v1.16.2 // 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---\ntest/integration/go.sum\n@@ -125,6 +125,8 @@ github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcb\n github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=\n github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=\n+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=\n github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=\n github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=\n github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=\n@@ -159,6 +161,8 @@ github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4\n github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n+github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=\n+github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=\n github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=\n@@ -263,6 +267,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0=\n github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n+github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n+github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\n---\n\n\n---\n\nChoice D:\nMakefile\n@@ -18,7 +18,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.24\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n DOCKER_BIN ?= docker\n---\nbuild/int.cloudbuild.yaml\n@@ -486,6 +486,6 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.24'\n options:\n machineType: 'E2_HIGHCPU_8'\n---\ntest/integration/go.mod\n@@ -7,7 +7,7 @@ toolchain go1.23.9\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n \tgithub.com/gruntwork-io/terratest v0.49.0\n-\tgithub.com/hashicorp/terraform-json v0.24.0\n+\tgithub.com/hashicorp/terraform-json v0.25.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n@@ -68,7 +68,7 @@ require (\n \tgithub.com/gogo/protobuf v1.3.2 // 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/go-cmp v0.7.0 // indirect\n \tgithub.com/google/gofuzz v1.2.0 // indirect\n \tgithub.com/google/uuid v1.6.0 // @@ \tgithub.com/gorilla/websocket v1.5.0 // indirect\n@@ -115,7 +115,7 @@ require (\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n-\tgithub.com/zclconf/go-cty v1.15.1 // indirect\n+\tgithub.com/zclconf/go-cty v1.16.2 // 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---\ntest/integration/go.sum\n@@ -125,6 +125,8 @@ github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcb\n github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=\n github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=\n+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=\n+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=\n github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=\n github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=\n github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=\n@@ -159,6 +161,8 @@ github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4\n github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n+github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=\n+github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=\n github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=\n@@ -263,6 +267,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0=\n github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n+github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n+github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nReverts terraform-google-modules/terraform-google-kubernetes-engine#2341\n\n---\n\nChoice A:\nexamples/simple_autopilot_private/main.tf\n@@ -50,8 +50,7 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n deletion_protection = false\n insecure_kubelet_readonly_port_enabled = false\n }\n---\nexamples/simple_autopilot_private_cmek/main.tf\n@@ -71,9 +71,8 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- boot_disk_kms_key = values(module.kms.keys)[0]\n- depends_on = [google_kms_crypto_key_iam_member.main]\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ boot_disk_kms_key = values(module.kms.keys)[0]\n+ depends_on = [google_kms_crypto_key_iam_member.main]\n }\n---\nexamples/simple_autopilot_private_non_default_sa/main.tf\n@@ -49,9 +49,8 @@ module \"gke\" {\n enable_vertical_pod_autoscaling = true\n enable_private_endpoint = true\n enable_private_nodes = true\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n \n master_authorized_networks = [\n {\n---\nexamples/simple_autopilot_public/main.tf\n@@ -47,12 +47,11 @@ module \"gke\" {\n release_channel = \"RAPID\"\n enable_vertical_pod_autoscaling = true\n network_tags = [local.cluster_type]\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- enable_l4_ilb_subsetting = true\n- stateful_ha = false\n- gke_backup_agent_config = false\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ enable_l4_ilb_subsetting = true\n+ stateful_ha = false\n+ gke_backup_agent_config = false\n ray_operator_config = {\n enabled = true\n logging_enabled = true\n---\n\n\n---\n\nChoice B:\nexamples/simple_autopilot_private/main.tf\n@@ -50,8 +50,7 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n deletion_protection = false\n insecure_kubelet_readonly_port_enabled = false\n }\n---\nexamples/simple_autopilot_private_cmek/main.tf\n@@ -71,9 +71,8 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- boot_disk_kms_key = values(module.kms.keys)[0]\n- depends_on = [google_kms_crypto_key_iam_member.main]\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ boot_disk_kms_key = values(module.kms.keys)[0]\n+ depends_on = [google_kms_crypto_key_iam_member.main]\n }\n---\nexamples/simple_autopilot_private_non_default_sa/main.tf\n@@ -49,9 +49,8 @@ module \"gke\" {\n enable_vertical_pod_autoscaling = true\n enable_private_endpoint = true\n enable_private_nodes = true\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n \n master_authorized_networks = [\n {\n---\nexamples/simple_autopilot_public/main.tf\n@@ -47,12 +47,11 @@ module \"gke\" {\n release_channel = \"RAPID\"\n enable_vertical_pod_autoscaling = true\n network_tags = [local.cluster_type]\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- enable_l4_ilb_subsetting = true\n- stateful_ha = false\n- gke_backup_agent_config = false\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ enable_l4_ilb_subsetting examples/simple_autopilot_private/main.tf\n@@ true\n+ stateful_ha = false\n+ gke_backup_agent_config = false\n ray_operator_config = {\n enabled = true\n logging_enabled = true\n---\n\n\n---\n\nChoice C:\nexamples/simple_autopilot_private/main.tf\n@@ -50,8 +50,7 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n deletion_protection = false\n insecure_kubelet_readonly_port_enabled = false\n }\n---\nexamples/simple_autopilot_private_cmek/main.tf\n@@ -71,9 +71,8 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- boot_disk_kms_key = values(module.kms.keys)[0]\n- depends_on = [google_kms_crypto_key_iam_member.main]\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ boot_disk_kms_key = values(module.kms.keys)[0]\n+ depends_on = [google_kms_crypto_key_iam_member.main]\n }\n---\nexamples/simple_autopilot_private_non_default_sa/main.tf\n@@ -49,9 +49,8 @@ module \"gke\" {\n enable_vertical_pod_autoscaling = true\n enable_private_endpoint = true\n enable_private_nodes = true\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n \n master_authorized_networks = [\n {\n---\nexamples/simple_autopilot_public/main.tf\n@@ -47,12 +47,11 @@ module \"gke\" {\n release_channel = \"RAPID\"\n enable_vertical_pod_autoscaling = true\n network_tags = [local.cluster_type]\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- enable_l4_ilb_subsetting = true\n- stateful_ha = false\n- gke_backup_agent_config = false\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ enable_l4_ilb_subsetting = true\n+ stateful_ha = false\n+ gke_backup_agent_config = false\n ray_operator_config = {\n enabled = true\n logging_enabled = true\n---\n\n\n---\n\nChoice D:\nexamples/simple_autopilot_private/main.tf\n@@ -50,8 +50,7 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n deletion_protection = false\n insecure_kubelet_readonly_port_enabled = false\n }\n---\nexamples/simple_autopilot_private_cmek/main.tf\n@@ -71,9 +71,8 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- boot_disk_kms_key = values(module.kms.keys)[0]\n- depends_on = [google_kms_crypto_key_iam_member.main]\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = boot_disk_kms_key = values(module.kms.keys)[0]\n+ depends_on = [google_kms_crypto_key_iam_member.main]\n }\n---\nexamples/simple_autopilot_private_non_default_sa/main.tf\n@@ -49,9 +49,8 @@ module \"gke\" {\n enable_vertical_pod_autoscaling = true\n enable_private_endpoint = true\n enable_private_nodes = true\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n \n master_authorized_networks = [\n {\n---\nexamples/simple_autopilot_public/main.tf\n@@ -47,12 +47,11 @@ module \"gke\" {\n release_channel = \"RAPID\"\n enable_vertical_pod_autoscaling = true\n network_tags = [local.cluster_type]\n- # TODO: b/413643369\n- # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- enable_l4_ilb_subsetting = true\n- stateful_ha = false\n- gke_backup_agent_config = false\n+ node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ enable_l4_ilb_subsetting = true\n+ stateful_ha = false\n+ gke_backup_agent_config = false\n ray_operator_config = {\n enabled = true\n logging_enabled = true\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://redirect.github.com/gruntwork-io/terratest) | `v0.48.2` -> `v0.49.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.49.0`](https://redirect.github.com/gruntwork-io/terratest/releases/tag/v0.49.0)\n\n[Compare Source](https://redirect.github.com/gruntwork-io/terratest/compare/v0.48.2...v0.49.0)\n\n#### Modules affected\n\n- `terraform`\n- `helm`\n- `azure`\n- `aws`\n- `k8s`\n- `logger`\n- `packer`\n\n#### What's Changed\n\n- feat: Creating a test for TF_LOG by [@​james03160927](https://redirect.github.com/james03160927) in [#​1512](https://redirect.github.com/gruntwork-io/terratest/pull/1512)\n- feat: handle multiple yaml doc by [@​james03160927](https://redirect.github.com/james03160927) in [#​1514](https://redirect.github.com/gruntwork-io/terratest/pull/1514)\n- feat: use the new sdk for azure resource group by [@​james03160927](https://redirect.github.com/james03160927) in [#​1511](https://redirect.github.com/gruntwork-io/terratest/pull/1511)\n- feat: Stop DynamoDB methods with E Failing Immediately by [@​robmorgan](https://redirect.github.com/robmorgan) in [#​1507](https://redirect.github.com/gruntwork-io/terratest/pull/1507)\n- feat: Get and Put for ECR repo policies by [@​felixfriedrich](https://redirect.github.com/felixfriedrich) in [#​1519](https://redirect.github.com/gruntwork-io/terratest/pull/1519)\n- feat: include --version in helm upgrade by [@​jijiechen](https://redirect.github.com/jijiechen) in [#​1532](https://redirect.github.com/gruntwork-io/terratest/pull/1532)\n- feat: add mixed vars support by [@​james03160927](https://redirect.github.com/james03160927) in [#​1517](https://redirect.github.com/gruntwork-io/terratest/pull/1517)\n- feat: Add helper function for parsing packer-manifest.json by [@​james03160927](https://redirect.github.com/james03160927) in [#​1546](https://redirect.github.com/gruntwork-io/terratest/pull/1546)\n- feat: Support a s3:putobject by [@​james03160927](https://redirect.github.com/james03160927) in [#​1525](https://redirect.github.com/gruntwork-io/terratest/pull/1525)\n- feat: capture terraform stdout stderr and exitcode separately by [@​james03160927](https://redirect.github.com/james03160927) in [#​1530](https://redirect.github.com/gruntwork-io/terratest/pull/1530)\n- feat: add UnmarshalK8SYamlsE by [@​james03160927](https://redirect.github.com/james03160927) in [#​1533](https://redirect.github.com/gruntwork-io/terratest/pull/1533)\n- feat: add support for extra arguments by [@​james03160927](https://redirect.github.com/james03160927) in [#​1523](https://redirect.github.com/gruntwork-io/terratest/pull/1523)\n- feat: allow --backend-config to use file path by setting the value to nil by [@​james03160927](https://redirect.github.com/james03160927) in [#​1539](https://redirect.github.com/gruntwork-io/terratest/pull/1539)\n- feat: Support for ListNamespaces function by [@​james03160927](https://redirect.github.com/james03160927) in [#​1543](https://redirect.github.com/gruntwork-io/terratest/pull/1543)\n- feat: K8S fix forward to service port by [@​james03160927](https://redirect.github.com/james03160927) in [#​1547](https://redirect.github.com/gruntwork-io/terratest/pull/1547)\n- fix: add test for duplicate key by [@​james03160927](https://redirect.github.com/james03160927) in [#​1518](https://redirect.github.com/gruntwork-io/terratest/pull/1518)\n- fix: support custom TG logger settings by [@​bt-macole](https://redirect.github.com/bt-macole) in [#​1509](https://redirect.github.com/gruntwork-io/terratest/pull/1509)\n- docs: Improve README for terraform database example module by [@​james03160927](https://redirect.github.com/james03160927) in [#​1515](https://redirect.github.com/gruntwork-io/terratest/pull/1515)\n- chore: adjust fixture to fix broken tests by [@​james03160927](https://redirect.github.com/james03160927) in [#​1548](https://redirect.github.com/gruntwork-io/terratest/pull/1548)\n- chore: add RenderTemplateAndGetStdOutErrE & RunHelmCommandAndGetStdOutErrE by [@​james03160927](https://redirect.github.com/james03160927) in [#​1526](https://redirect.github.com/gruntwork-io/terratest/pull/1526)\n- chore: Update parseListOfMaps to handle non-map data structures by [@​james03160927](https://redirect.github.com/james03160927) in [#​1529](https://redirect.github.com/gruntwork-io/terratest/pull/1529)\n- chore: add test for literal block by [@​james03160927](https://redirect.github.com/james03160927) in [#​1535](https://redirect.github.com/gruntwork-io/terratest/pull/1535)\n- chore: Update CODEOWNERS by [@​james03160927](https://redirect.github.com/james03160927) in [#​1554](https://redirect.github.com/gruntwork-io/terratest/pull/1554)\n- chore: Adding Terragrunt team to CODEOWNERS by [@​yhakbar](https://redirect.github.com/yhakbar) in [#​1513](https://redirect.github.com/gruntwork-io/terratest/pull/1513)\n- chore(deps): Bump nokogiri from 1.16.5 to 1.18.3 in /docs by [@​dependabot](https://redirect.github.com/dependabot) in [#​1516](https://redirect.github.com/gruntwork-io/terratest/pull/1516)\n- chore(deps): Bump github.com/golang-jwt/jwt/v5 from 5.2.1 to 5.2.2 by [@​dependabot](https://redirect.github.com/dependabot) in [#​1527](https://redirect.github.com/gruntwork-io/terratest/pull/1527)\n- chore(deps): Bump golang.org/x/crypto from 0.32.0 to 0.35.0 by [@​dependabot](https://redirect.github.com/dependabot) in [#​1541](https://redirect.github.com/gruntwork-io/terratest/pull/1541)\n- chore(deps): Bump golang.org/x/net from 0.34.0 to 0.38.0 by [@​dependabot](https://redirect.github.com/dependabot) in [#​1542](https://redirect.github.com/gruntwork-io/terratest/pull/1542)\n- chore(deps): Bump nokogiri from 1.18.3 to 1.18.8 in /docs by [@​dependabot](https://redirect.github.com/dependabot) in [#​1545](https://redirect.github.com/gruntwork-io/terratest/pull/1545)\n\n#### New Contributors\n\n- [@​felixfriedrich](https://redirect.github.com/felixfriedrich) made their first contribution in [#​1519](https://redirect.github.com/gruntwork-io/terratest/pull/1519)\n- [@​jijiechen](https://redirect.github.com/jijiechen) made their first contribution in [#​1532](https://redirect.github.com/gruntwork-io/terratest/pull/1532)\n\n**Full Changelog**: <https://github.com/gruntwork-io/terratest/compare/v0.48.2...v0.49.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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC4xMS45IiwidXBkYXRlZEluVmVyIjoiNDAuMTEuOSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest +6,7 @@ toolchain go1.23.9\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n-\tgithub.com/gruntwork-io/terratest v0.48.2\n+\tgithub.com/gruntwork-io/terratest v0.49.0\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n---\ntest/integration/go.sum\n@@ -136,8 +136,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm\n github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.48.2 h1:+VwfODchq8jxZZWD+s8gBlhD1z6/C4bFLNrhpm9ONrs=\n-github.com/gruntwork-io/terratest v0.48.2/go.mod h1:Y5ETyD4ZQ2MZhasPno272fWuCpKwvTPYDi8Y0tIMqTE=\n+github.com/gruntwork-io/terratest v0.49.0 h1:GurfpHEOEr8vntB77QcxDh+P7aiQRUgPFdgb6q9PuWI=\n+github.com/gruntwork-io/terratest v0.49.0/go.mod h1:/+dfGio9NqUpvvukuPo29B8zy6U5FYJn9PdmvwztK4A=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ toolchain go1.23.9\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n-\tgithub.com/gruntwork-io/terratest v0.48.2\n+\tgithub.com/gruntwork-io/terratest v0.49.0\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n---\ntest/integration/go.sum\n@@ -136,8 +136,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm\n github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.48.2 h1:+VwfODchq8jxZZWD+s8gBlhD1z6/C4bFLNrhpm9ONrs=\n-github.com/gruntwork-io/terratest v0.48.2/go.mod h1:Y5ETyD4ZQ2MZhasPno272fWuCpKwvTPYDi8Y0tIMqTE=\n+github.com/gruntwork-io/terratest v0.49.0 test/integration/go.mod\n@@ v0.49.0/go.mod h1:/+dfGio9NqUpvvukuPo29B8zy6U5FYJn9PdmvwztK4A=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ toolchain go1.23.9\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n-\tgithub.com/gruntwork-io/terratest v0.48.2\n+\tgithub.com/gruntwork-io/terratest v0.49.0\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n---\ntest/integration/go.sum\n@@ -136,8 +136,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm\n github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.48.2 h1:+VwfODchq8jxZZWD+s8gBlhD1z6/C4bFLNrhpm9ONrs=\n-github.com/gruntwork-io/terratest v0.48.2/go.mod h1:Y5ETyD4ZQ2MZhasPno272fWuCpKwvTPYDi8Y0tIMqTE=\n+github.com/gruntwork-io/terratest v0.49.0 h1:GurfpHEOEr8vntB77QcxDh+P7aiQRUgPFdgb6q9PuWI=\n+github.com/gruntwork-io/terratest v0.49.0/go.mod h1:/+dfGio9NqUpvvukuPo29B8zy6U5FYJn9PdmvwztK4A=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ toolchain go1.23.9\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n-\tgithub.com/gruntwork-io/terratest v0.48.2\n+\tgithub.com/gruntwork-io/terratest v0.49.0\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n---\ntest/integration/go.sum\n@@ -136,8 +136,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm\n github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.48.2 h1:+VwfODchq8jxZZWD+s8gBlhD1z6/C4bFLNrhpm9ONrs=\n-github.com/gruntwork-io/terratest v0.48.2/go.mod h1:Y5ETyD4ZQ2MZhasPno272fWuCpKwvTPYDi8Y0tIMqTE=\n+github.com/gruntwork-io/terratest v0.49.0 h1:GurfpHEOEr8vntB77QcxDh+P7aiQRUgPFdgb6q9PuWI=\n+github.com/gruntwork-io/terratest v0.49.0/go.mod h1:/+dfGio9NqUpvvukuPo29B8zy6U5FYJn9PdmvwztK4A=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap \tgithub.com/tidwall/gjson h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| nginx | kubernetes_pod | minor | `1.27.5` -> `1.28.0` |\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yNjQuMCIsInVwZGF0ZWRJblZlciI6IjM5LjI2NC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.5\"\n+ image = \"nginx:1.28.0\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice B:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- \"nginx-example\"\n image = \"nginx:1.27.5\"\n+ image = \"nginx:1.28.0\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice C:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.5\"\n+ image = \"nginx:1.28.0\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice D:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.5\"\n+ image = \"nginx:1.28.0\"\n name = \"nginx-example\"\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 Compute Engine 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| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | toolchain | patch | `1.23.8` -> `1.23.9` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.23.9`](https://redirect.github.com/golang/go/compare/go1.23.8...go1.23.9)\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC43LjEiLCJ1cGRhdGVkSW5WZXIiOiI0MC43LjEiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbImRlcGVuZGVuY2llcyJdfQ==-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go v0.17.6\n---\n \n-toolchain go1.23.8\n+toolchain go1.23.9\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -2,7 \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.8\n+toolchain go1.23.9\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n -2,7 go1.23.8\n+toolchain go1.23.9\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.8\n+toolchain go1.23.9\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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-router/google](https://registry.terraform.io/modules/terraform-google-modules/cloud-router/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-router)) | module | major | `~> 6.0` -> `~> 7.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-cloud-router (terraform-google-modules/cloud-router/google)</summary>\n\n### [`v7.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-router/blob/HEAD/CHANGELOG.md#700-2025-04-28)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-router/compare/v6.3.0...v7.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TPG >= 5.12:** update interface module min provider version >= 5.12 ([#​153](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-router/issues/153))\n- MD5 authentication for BGP support\n\n##### Features\n\n- MD5 authentication for BGP support ([e6f8b6c](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-router/commit/e6f8b6c73f564faea90b90b468757e5e35b244a6))\n- partner interconnect ([#​147](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-router/issues/147)) ([0cff190](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-router/commit/0cff1905735f4de59b65e12793adec7d3d6fa777))\n\n##### Bug Fixes\n\n- **TPG >= 5.12:** update interface module min provider version >= 5.12 ([#​153](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-router/issues/153)) ([532c95d](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-router/commit/532c95d348055bc8d8eac198837f83352409c3a5))\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC43LjEiLCJ1cGRhdGVkSW5WZXIiOiI0MC43LjEiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbImRlcGVuZGVuY2llcyJdfQ==-->\n\n\n---\n\nChoice A:\nexamples/island_cluster_anywhere_in_gcp_design/network.tf\n@@ -163,7 +163,7 @@ resource \"google_compute_network_attachment\" \"router_net_attachment\" {\n \n module \"cloud_router\" {\n source = \"terraform-google-modules/cloud-router/google\"\n- version = \"~> 6.0\"\n+ version = \"~> 7.0\"\n for_each = { for k, v in var.gke_spokes : k => v name \n name = \"router-${each.value[\"cluster_name\"]}-${random_id.rand.hex}\"\n---\n\n\n---\n\nChoice B:\nexamples/island_cluster_anywhere_in_gcp_design/network.tf\n@@ -163,7 +163,7 @@ resource \"google_compute_network_attachment\" \"router_net_attachment\" {\n \n module \"cloud_router\" {\n source = \"terraform-google-modules/cloud-router/google\"\n- version = \"~> 6.0\"\n+ version = \"~> 7.0\"\n for_each = { for k, v in var.gke_spokes : => v }\n \n name = \"router-${each.value[\"cluster_name\"]}-${random_id.rand.hex}\"\n---\n\n\n---\n\nChoice C:\nexamples/island_cluster_anywhere_in_gcp_design/network.tf\n@@ -163,7 +163,7 @@ resource \"google_compute_network_attachment\" \"router_net_attachment\" {\n \n module \"cloud_router\" {\n source = \"terraform-google-modules/cloud-router/google\"\n- version = \"~> 6.0\"\n+ version = \"~> 7.0\"\n for_each = { k, v in var.gke_spokes : k => v }\n \n name = \"router-${each.value[\"cluster_name\"]}-${random_id.rand.hex}\"\n---\n\n\n---\n\nChoice D:\nexamples/island_cluster_anywhere_in_gcp_design/network.tf\n@@ -163,7 +163,7 @@ resource \"google_compute_network_attachment\" \"router_net_attachment\" {\n \n module \"cloud_router\" {\n source = \"terraform-google-modules/cloud-router/google\"\n- version = \"~> 6.0\"\n+ version = \"~> 7.0\"\n for_each = { for k, v in var.gke_spokes : k => v }\n \n name = \"router-${each.value[\"cluster_name\"]}-${random_id.rand.hex}\"\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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/network/google](https://registry.terraform.io/modules/terraform-google-modules/network/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-network)) | module | major | `~> 10.0` -> `~> 11.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-network (terraform-google-modules/network/google)</summary>\n\n### [`v11.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-network/blob/HEAD/CHANGELOG.md#1100-2025-04-23)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-network/compare/v10.0.0...v11.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TPG>6.28:** added support for packet mirroring firewall policy rule, src_networks, src_network_scope and dest_network_scope ([#​596](https://redirect.github.com/terraform-google-modules/terraform-google-network/issues/596))\n\n##### Features\n\n- added security profile rule support in network firewall policy ([#​602](https://redirect.github.com/terraform-google-modules/terraform-google-network/issues/602)) ([339e6f6](https://redirect.github.com/terraform-google-modules/terraform-google-network/commit/339e6f6013d5d7b749f4e8eb18410dc59f1d6ab3))\n- **TPG>6.28:** added support for packet mirroring firewall policy rule, src_networks, src_network_scope and dest_network_scope ([#​596](https://redirect.github.com/terraform-google-modules/terraform-google-network/issues/596)) ([3ac6496](https://redirect.github.com/terraform-google-modules/terraform-google-network/commit/3ac64964bd2fd7f9f4f763d6f5152e9456f2e175))\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC43LjEiLCJ1cGRhdGVkSW5WZXIiOiI0MC43LjEiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbImRlcGVuZGVuY2llcyJdfQ==-->\n\n\n---\n\nChoice A:\nexamples/confidential_safer_cluster/network.tf\n@@ -16,7 +16,7 @@\n \n module \"gcp-network\" {\n source = \"terraform-google-modules/network/google\"\n- version version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = var.project_id\n network_name = local.network_name\n---\nexamples/island_cluster_anywhere_in_gcp_design/network.tf\n@@ -14,7 +14,7 @@\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n for_each = { for k, v in var.gke_spokes : k => v }\n \n---\nexamples/island_cluster_with_vm_router/main.tf\n@@ -25,7 +25,7 @@ resource \"google_service_account\" \"gke-sa\" {\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n network_name = \"gke-net-${random_id.rand.hex}\"\n routing_mode = \"GLOBAL\"\n---\nexamples/safer_cluster_iap_bastion/network.tf\n@@ -17,7 +17,7 @@\n \n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = module.enabled_google_apis.project_id\n network_name = var.network_name\n---\n\n\n---\n\nChoice B:\nexamples/confidential_safer_cluster/network.tf\n@@ -16,7 +16,7 @@\n \n module \"gcp-network\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = var.project_id\n network_name = local.network_name\n---\nexamples/island_cluster_anywhere_in_gcp_design/network.tf\n@@ -14,7 +14,7 @@\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n for_each = { for k, v in var.gke_spokes : k => version }\n \n---\nexamples/island_cluster_with_vm_router/main.tf\n@@ -25,7 +25,7 @@ resource \"google_service_account\" \"gke-sa\" {\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n network_name = \"gke-net-${random_id.rand.hex}\"\n routing_mode = \"GLOBAL\"\n---\nexamples/safer_cluster_iap_bastion/network.tf\n@@ -17,7 +17,7 @@\n \n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = module.enabled_google_apis.project_id\n network_name = var.network_name\n---\n\n\n---\n\nChoice C:\nexamples/confidential_safer_cluster/network.tf\n@@ -16,7 +16,7 @@\n \n module \"gcp-network\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = var.project_id\n network_name = local.network_name\n---\nexamples/island_cluster_anywhere_in_gcp_design/network.tf\n@@ -14,7 +14,7 @@\n \n module \"net\" source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n for_each = { for k, v in var.gke_spokes : k => v }\n \n---\nexamples/island_cluster_with_vm_router/main.tf\n@@ -25,7 +25,7 @@ resource \"google_service_account\" \"gke-sa\" {\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n network_name = \"gke-net-${random_id.rand.hex}\"\n routing_mode = \"GLOBAL\"\n---\nexamples/safer_cluster_iap_bastion/network.tf\n@@ -17,7 +17,7 @@\n \n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = module.enabled_google_apis.project_id\n network_name = var.network_name\n---\n\n\n---\n\nChoice D:\nexamples/confidential_safer_cluster/network.tf\n@@ -16,7 +16,7 @@\n \n module \"gcp-network\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = var.project_id\n network_name = local.network_name\n---\nexamples/island_cluster_anywhere_in_gcp_design/network.tf\n@@ -14,7 +14,7 @@\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n for_each = { for k, v in var.gke_spokes : k => v }\n \n---\nexamples/island_cluster_with_vm_router/main.tf\n@@ -25,7 +25,7 @@ resource \"google_service_account\" \"gke-sa\" {\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n network_name = \"gke-net-${random_id.rand.hex}\"\n routing_mode = \"GLOBAL\"\n---\nexamples/safer_cluster_iap_bastion/network.tf\n@@ -17,7 +17,7 @@\n \n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 10.0\"\n+ version = \"~> 11.0\"\n \n project_id = module.enabled_google_apis.project_id\n network_name = var.network_name\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nb/413643369\n\n---\n\nChoice A:\nexamples/simple_autopilot_private/main.tf\n@@ -50,7 +50,8 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n deletion_protection = false\n insecure_kubelet_readonly_port_enabled = false\n }\n---\nexamples/simple_autopilot_private_cmek/main.tf\n@@ -71,8 +71,9 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- boot_disk_kms_key = values(module.kms.keys)[0]\n- depends_on = [google_kms_crypto_key_iam_member.main]\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ boot_disk_kms_key = values(module.kms.keys)[0]\n+ depends_on = [google_kms_crypto_key_iam_member.main]\n }\n---\nexamples/simple_autopilot_private_non_default_sa/main.tf\n@@ -49,8 +49,9 @@ module \"gke\" {\n enable_vertical_pod_autoscaling = true\n enable_private_endpoint = true\n enable_private_nodes = true\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n \n master_authorized_networks = [\n {\n---\nexamples/simple_autopilot_public/main.tf\n@@ -47,11 +47,12 @@ module \"gke\" {\n release_channel = \"RAPID\"\n enable_vertical_pod_autoscaling = true\n network_tags = [local.cluster_type]\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- enable_l4_ilb_subsetting = true\n- stateful_ha = false\n- gke_backup_agent_config = false\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ enable_l4_ilb_subsetting = true\n+ stateful_ha = false\n+ gke_backup_agent_config = false\n ray_operator_config = {\n enabled = true\n logging_enabled = true\n---\n\n\n---\n\nChoice B:\nexamples/simple_autopilot_private/main.tf\n@@ -50,7 +50,8 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n deletion_protection = false\n insecure_kubelet_readonly_port_enabled = false\n }\n---\nexamples/simple_autopilot_private_cmek/main.tf\n@@ -71,8 +71,9 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- true\n- = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- boot_disk_kms_key = values(module.kms.keys)[0]\n- depends_on = [google_kms_crypto_key_iam_member.main]\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ boot_disk_kms_key = values(module.kms.keys)[0]\n+ depends_on = [google_kms_crypto_key_iam_member.main]\n }\n---\nexamples/simple_autopilot_private_non_default_sa/main.tf\n@@ -49,8 +49,9 @@ module \"gke\" {\n enable_vertical_pod_autoscaling = true\n enable_private_endpoint = true\n enable_private_nodes = true\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n \n master_authorized_networks = [\n {\n---\nexamples/simple_autopilot_public/main.tf\n@@ -47,11 +47,12 @@ module \"gke\" {\n release_channel = \"RAPID\"\n enable_vertical_pod_autoscaling = true\n network_tags = [local.cluster_type]\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- enable_l4_ilb_subsetting = true\n- stateful_ha = false\n- gke_backup_agent_config = false\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ enable_l4_ilb_subsetting = true\n+ stateful_ha = false\n+ gke_backup_agent_config = false\n ray_operator_config = {\n enabled = true\n logging_enabled = true\n---\n\n\n---\n\nChoice C:\nexamples/simple_autopilot_private/main.tf\n@@ -50,7 +50,8 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n deletion_protection = false\n insecure_kubelet_readonly_port_enabled = false\n }\n---\nexamples/simple_autopilot_private_cmek/main.tf\n@@ -71,8 +71,9 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- boot_disk_kms_key = values(module.kms.keys)[0]\n- depends_on = [google_kms_crypto_key_iam_member.main]\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ boot_disk_kms_key = values(module.kms.keys)[0]\n+ depends_on = [google_kms_crypto_key_iam_member.main]\n }\n---\nexamples/simple_autopilot_private_non_default_sa/main.tf\n@@ -49,8 +49,9 @@ module \"gke\" {\n enable_vertical_pod_autoscaling = true\n enable_private_endpoint = true\n enable_private_nodes = true\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n \n master_authorized_networks = [\n deletion_protection {\n---\nexamples/simple_autopilot_public/main.tf\n@@ -47,11 +47,12 @@ module \"gke\" {\n release_channel = \"RAPID\"\n enable_vertical_pod_autoscaling = true\n network_tags = [local.cluster_type]\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- enable_l4_ilb_subsetting = true\n- stateful_ha = false\n- gke_backup_agent_config = false\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ enable_l4_ilb_subsetting = true\n+ stateful_ha = false\n+ gke_backup_agent_config = false\n ray_operator_config = {\n enabled = true\n logging_enabled = true\n---\n\n\n---\n\nChoice D:\nexamples/simple_autopilot_private/main.tf\n@@ -50,7 +50,8 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n deletion_protection = false\n insecure_kubelet_readonly_port_enabled = false\n }\n---\nexamples/simple_autopilot_private_cmek/main.tf\n@@ -71,8 +71,9 @@ module \"gke\" {\n enable_private_endpoint = true\n enable_private_nodes = true\n network_tags = [local.cluster_type]\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- boot_disk_kms_key = values(module.kms.keys)[0]\n- depends_on = [google_kms_crypto_key_iam_member.main]\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ boot_disk_kms_key = values(module.kms.keys)[0]\n+ depends_on = [google_kms_crypto_key_iam_member.main]\n }\n---\nexamples/simple_autopilot_private_non_default_sa/main.tf\n@@ -49,8 +49,9 @@ module \"gke\" {\n enable_vertical_pod_autoscaling = true\n enable_private_endpoint = true\n enable_private_nodes = true\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n \n master_authorized_networks = [\n {\n---\nexamples/simple_autopilot_public/main.tf\n@@ -47,11 +47,12 @@ module \"gke\" {\n release_channel = \"RAPID\"\n enable_vertical_pod_autoscaling = true\n network_tags -71,8 = [local.cluster_type]\n- node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n- deletion_protection = false\n- enable_l4_ilb_subsetting = true\n- stateful_ha = false\n- gke_backup_agent_config = false\n+ # TODO: b/413643369\n+ # node_pools_cgroup_mode = \"CGROUP_MODE_V2\"\n+ deletion_protection = false\n+ enable_l4_ilb_subsetting = true\n+ stateful_ha = false\n+ gke_backup_agent_config = false\n ray_operator_config = {\n enabled = true\n logging_enabled = true\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -697,15 +697,10 @@ resource \"google_container_cluster\" \"primary\" {\n \n {% endif %}\n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null {% if private_cluster %}|| (var.enable_private_endpoint && var.deploy_using_private_endpoint) {% endif %}? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- {% if private_cluster %}\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n-{% else %}\n allow_external_traffic = var.dns_allow_external_traffic\n-{% endif %}\n }\n }\n }\n---\ndocs/upgrading_to_v37.0.md\n@@ -0,0 +1,18 @@\n+# Upgrading to v37.0\n+The v37.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6.27 or higher of the Google Cloud Platform Providers.\n+\n+### Private Cluster DNS Allow External Traffic\n+DNS allow external traffic is now controlled solely by `dns_allow_external_traffic` for private clusters.\n+To enable, set `dns_allow_external_traffic` to `true`.\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 36.0\"\n++ version = \"~> 37.0\"\n+\n++ dns_allow_external_traffic = true\n+}\n+```\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -351,11 +351,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -592,11 +592,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -592,11 +592,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -541,11 +541,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -541,11 +541,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -697,15 +697,10 @@ resource \"google_container_cluster\" \"primary\" {\n \n {% endif %}\n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null {% if private_cluster %}|| (var.enable_private_endpoint && var.deploy_using_private_endpoint) {% endif %}? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- {% if private_cluster %}\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n-{% else %}\n allow_external_traffic = var.dns_allow_external_traffic\n-{% endif %}\n }\n }\n }\n---\ndocs/upgrading_to_v37.0.md\n@@ -0,0 +1,18 @@\n+# Upgrading to v37.0\n+The v37.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6.27 or higher of the Google Cloud Platform Providers.\n+\n+### Private Cluster DNS Allow External Traffic\n+DNS allow external traffic is now controlled solely by `dns_allow_external_traffic` for private clusters.\n+To enable, set `dns_allow_external_traffic` to `true`.\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 36.0\"\n++ version = \"~> 37.0\"\n+\n++ dns_allow_external_traffic = true\n+}\n+```\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -351,11 +351,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -592,11 +592,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -592,11 +592,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -541,11 +541,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -541,11 +541,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -697,15 +697,10 @@ resource \"google_container_cluster\" \"primary\" {\n \n {% endif %}\n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null {% if private_cluster %}|| (var.enable_private_endpoint && var.deploy_using_private_endpoint) = endif %}? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- {% if private_cluster %}\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n-{% else %}\n allow_external_traffic = var.dns_allow_external_traffic\n-{% endif %}\n }\n }\n }\n---\ndocs/upgrading_to_v37.0.md\n@@ -0,0 +1,18 @@\n+# Upgrading to v37.0\n+The v37.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6.27 or higher of the Google Cloud Platform Providers.\n+\n+### Private Cluster DNS Allow External Traffic\n+DNS allow external traffic is now controlled solely by `dns_allow_external_traffic` for private clusters.\n+To enable, set `dns_allow_external_traffic` to `true`.\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 36.0\"\n++ version = \"~> 37.0\"\n+\n++ dns_allow_external_traffic = true\n+}\n+```\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -351,11 +351,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -592,11 +592,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -592,11 +592,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -541,11 +541,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -541,11 +541,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -697,15 +697,10 @@ resource \"google_container_cluster\" \"primary\" {\n \n {% endif %}\n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null {% if private_cluster %}|| (var.enable_private_endpoint && var.deploy_using_private_endpoint) {% endif %}? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- {% if private_cluster %}\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n-{% else %}\n allow_external_traffic = var.dns_allow_external_traffic\n-{% endif %}\n }\n }\n }\n---\ndocs/upgrading_to_v37.0.md\n@@ -0,0 +1,18 @@\n+# Upgrading to v37.0\n+The v37.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6.27 or higher of the Google Cloud Platform Providers.\n+\n+### Private Cluster DNS Allow External Traffic\n+DNS allow external traffic is now controlled solely by `dns_allow_external_traffic` for private clusters.\n+To enable, set `dns_allow_external_traffic` to `true`.\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 36.0\"\n++ version = \"~> 37.0\"\n+\n++ dns_allow_external_traffic = true\n+}\n+```\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -351,11 +351,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -592,11 +592,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -592,11 +592,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -541,11 +541,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\n }\n }\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -541,11 +541,10 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []\n+ for_each = var.dns_allow_external_traffic != null ? [1] : []\n content {\n dns_endpoint_config {\n- # TODO: Migrate to only dns_allow_external_traffic in next breaking release\n- allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint\n+ allow_external_traffic = var.dns_allow_external_traffic\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 Compute Engine 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| nginx | kubernetes_pod | patch | `1.27.4` -> `1.27.5` | `1.28.0` |\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yNDguNCIsInVwZGF0ZWRJblZlciI6IjM5LjI1Ny4zIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.4\"\n+ image = \"nginx:1.27.5\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice B:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.4\"\n+ image = \"nginx:1.27.5\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice C:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.4\"\n+ image = \"nginx:1.27.5\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice D:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- = \"nginx:1.27.4\"\n+ image = \"nginx:1.27.5\"\n name = \"nginx-example\"\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 Compute Engine 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.36.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>See full diff in <a href=\"https://github.com/golang/net/compare/v0.36.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\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-kubernetes-engine/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -116,14 +116,14 @@ require (\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.35.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.36.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.11.0 // indirect\n-\tgolang.org/x/sys v0.30.0 // indirect\n-\tgolang.org/x/term v0.29.0 // indirect\n-\tgolang.org/x/text v0.22.0 // indirect\n+\tgolang.org/x/sync v0.12.0 // indirect\n+\tgolang.org/x/sys v0.31.0 // indirect\n+\tgolang.org/x/term v0.30.0 // indirect\n+\tgolang.org/x/text v0.23.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n---\ntest/integration/go.sum\n@@ -268,8 +268,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=\n-golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=\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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n@@ -278,27 +278,27 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod \tgolang.org/x/mod golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=\n-golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=\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.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=\n-golang.org/x/sync v0.11.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-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=\n-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=\n-golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=\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.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.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=\n-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=\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.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=\n golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=\n golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -116,14 +116,14 @@ require (\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.35.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.36.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.11.0 // indirect\n-\tgolang.org/x/sys v0.30.0 // indirect\n-\tgolang.org/x/term v0.29.0 // indirect\n-\tgolang.org/x/text v0.22.0 // indirect\n+\tgolang.org/x/sync v0.12.0 // indirect\n+\tgolang.org/x/sys v0.31.0 // indirect\n+\tgolang.org/x/term v0.30.0 // indirect\n+\tgolang.org/x/text v0.23.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n---\ntest/integration/go.sum\n@@ -268,8 +268,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=\n-golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=\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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n@@ -278,27 +278,27 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=\n-golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=\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.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=\n-golang.org/x/sync v0.11.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-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=\n-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=\n-golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=\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.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.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=\n-golang.org/x/text v0.0.0-20190412213103-97732733099d/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=\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.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=\n golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=\n golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -116,14 +116,14 @@ require (\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.35.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.36.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.11.0 // indirect\n-\tgolang.org/x/sys v0.30.0 // indirect\n-\tgolang.org/x/term v0.29.0 // indirect\n-\tgolang.org/x/text v0.22.0 // indirect\n+\tgolang.org/x/sync v0.12.0 // indirect\n+\tgolang.org/x/sys v0.31.0 // indirect\n+\tgolang.org/x/term v0.30.0 // indirect\n+\tgolang.org/x/text v0.23.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n---\ntest/integration/go.sum\n@@ -268,8 +268,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=\n-golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=\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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n@@ -278,27 +278,27 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=\n-golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=\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.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod v0.38.0 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=\n-golang.org/x/sync v0.11.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-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=\n-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=\n-golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=\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.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.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=\n-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=\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.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=\n golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=\n golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -116,14 +116,14 @@ require (\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.35.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.36.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.11.0 // indirect\n-\tgolang.org/x/sys v0.30.0 // indirect\n-\tgolang.org/x/term v0.29.0 // indirect\n-\tgolang.org/x/text v0.22.0 // indirect\n+\tgolang.org/x/sync v0.12.0 // indirect\n+\tgolang.org/x/sys v0.31.0 // indirect\n+\tgolang.org/x/term v0.30.0 // indirect\n+\tgolang.org/x/text v0.23.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n---\ntest/integration/go.sum\n@@ -268,8 +268,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=\n-golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=\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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n@@ -278,27 +278,27 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=\n-golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=\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.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=\n-golang.org/x/sync v0.11.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-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=\n-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=\n-golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=\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.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.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=\n-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=\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.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=\n golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=\n golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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## [36.3.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.2.0...v36.3.0) (2025-04-10)\n\n\n### Features\n\n* support parallelstore csi driver ([#2203](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2203)) ([ab9d4cb](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/ab9d4cb6887af22c861e5c2db58b4f401f9625f6))\n* support total_egress_bandwidth_tier ([#2207](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2207)) ([2bd9cbd](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/2bd9cbd9c7b281dc21935fe52addb2bba87474e0))\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@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0\n \n Extending the adopted spec, each change should have a link to its corresponding pull request appended.\n \n+## [36.3.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.2.0...v36.3.0) (2025-04-10)\n+\n+\n+### Features\n+\n+* support parallelstore csi driver ([#2203](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2203)) ([ab9d4cb](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/ab9d4cb6887af22c861e5c2db58b4f401f9625f6))\n+* support total_egress_bandwidth_tier ([#2207](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2207)) ([2bd9cbd](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/2bd9cbd9c7b281dc21935fe52addb2bba87474e0))\n+\n ## [36.2.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.1.0...v36.2.0) (2025-04-03)\n \n \n---\nautogen/main/versions.tf.tmpl\n@@ -63,6 +63,6 @@ terraform {\n }\n }\n provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.3.0\"\n }\n }\n---\nautogen/safer-cluster/versions.tf.tmpl\n@@ -23,6 +23,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.3.0\"\n }\n }\n---\nmodules/auth/versions.tf\n@@ -26,6 +26,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.3.0\"\n }\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.3.0\"\n }\n }\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.3.0\"\n }\n }\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/beta-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.3.0\"\n }\n }\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/beta-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.3.0\"\n }\n }\n---\nmodules/binary-authorization/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.3.0\"\n }\n }\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -33,7 +33,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.3.0\"\n }\n }\n \n---\nmodules/fleet-membership/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.3.0\"\n }\n }\n---\nmodules/hub-legacy/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.3.0\"\n }\n }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -33,6 +33,6 @@ terraform module_name }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/private-cluster/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.3.0\"\n }\n }\n---\nmodules/safer-cluster-update-variant/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/safer-cluster/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.3.0\"\n }\n }\n---\nmodules/services/versions.tf\n@@ -19,6 +19,6 @@ terraform {\n required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.3.0\"\n }\n }\n---\nmodules/workload-identity/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.3.0\"\n }\n }\n---\nversions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.3.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0\n \n Extending the adopted spec, each change should have a link to its corresponding pull request appended.\n \n+## [36.3.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.2.0...v36.3.0) (2025-04-10)\n+\n+\n+### Features\n+\n+* support parallelstore csi driver module_name ([ab9d4cb](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/ab9d4cb6887af22c861e5c2db58b4f401f9625f6))\n+* support total_egress_bandwidth_tier ([#2207](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2207)) ([2bd9cbd](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/2bd9cbd9c7b281dc21935fe52addb2bba87474e0))\n+\n ## [36.2.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.1.0...v36.2.0) (2025-04-03)\n \n \n---\nautogen/main/versions.tf.tmpl\n@@ -63,6 +63,6 @@ terraform {\n }\n }\n provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.3.0\"\n }\n }\n---\nautogen/safer-cluster/versions.tf.tmpl\n@@ -23,6 +23,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.3.0\"\n }\n }\n---\nmodules/auth/versions.tf\n@@ -26,6 +26,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.3.0\"\n }\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.3.0\"\n }\n }\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.3.0\"\n }\n }\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/beta-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.3.0\"\n }\n }\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/beta-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.3.0\"\n }\n }\n---\nmodules/binary-authorization/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.3.0\"\n }\n }\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -33,7 +33,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.3.0\"\n }\n }\n \n---\nmodules/fleet-membership/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.3.0\"\n }\n }\n---\nmodules/hub-legacy/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.3.0\"\n }\n }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/private-cluster/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.3.0\"\n }\n }\n---\nmodules/safer-cluster-update-variant/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/safer-cluster/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.3.0\"\n }\n }\n---\nmodules/services/versions.tf\n@@ -19,6 +19,6 @@ terraform {\n required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.3.0\"\n }\n }\n---\nmodules/workload-identity/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.3.0\"\n }\n }\n---\nversions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.3.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0\n \n Extending the adopted spec, each change should have a link to its corresponding pull request appended.\n \n+## [36.3.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.2.0...v36.3.0) (2025-04-10)\n+\n+\n+### Features\n+\n+* support parallelstore csi driver ([#2203](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2203)) ([ab9d4cb](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/ab9d4cb6887af22c861e5c2db58b4f401f9625f6))\n+* support total_egress_bandwidth_tier ([#2207](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2207)) ([2bd9cbd](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/2bd9cbd9c7b281dc21935fe52addb2bba87474e0))\n+\n ## [36.2.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.1.0...v36.2.0) (2025-04-03)\n \n \n---\nautogen/main/versions.tf.tmpl\n@@ -63,6 +63,6 @@ terraform {\n }\n }\n provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.3.0\"\n }\n }\n---\nautogen/safer-cluster/versions.tf.tmpl\n@@ -23,6 +23,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.3.0\"\n }\n }\n---\nmodules/auth/versions.tf\n@@ -26,6 +26,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.3.0\"\n }\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.3.0\"\n }\n }\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.3.0\"\n }\n }\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/beta-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.3.0\"\n }\n }\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n {\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/beta-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.3.0\"\n }\n }\n---\nmodules/binary-authorization/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.3.0\"\n }\n }\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -33,7 +33,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.3.0\"\n }\n }\n \n---\nmodules/fleet-membership/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.3.0\"\n }\n }\n---\nmodules/hub-legacy/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.3.0\"\n }\n }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/private-cluster/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.3.0\"\n }\n }\n---\nmodules/safer-cluster-update-variant/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/safer-cluster/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.3.0\"\n }\n }\n---\nmodules/services/versions.tf\n@@ -19,6 +19,6 @@ terraform {\n required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.3.0\"\n }\n }\n---\nmodules/workload-identity/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.3.0\"\n }\n }\n---\nversions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.3.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0\n \n Extending the adopted spec, each change should have a link to its corresponding pull request appended.\n \n+## [36.3.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.2.0...v36.3.0) (2025-04-10)\n+\n+\n+### Features\n+\n+* support parallelstore csi driver ([#2203](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2203)) ([ab9d4cb](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/ab9d4cb6887af22c861e5c2db58b4f401f9625f6))\n+* support total_egress_bandwidth_tier ([#2207](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2207)) ([2bd9cbd](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/2bd9cbd9c7b281dc21935fe52addb2bba87474e0))\n+\n ## [36.2.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.1.0...v36.2.0) (2025-04-03)\n \n \n---\nautogen/main/versions.tf.tmpl\n@@ -63,6 +63,6 @@ terraform {\n }\n }\n provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.3.0\"\n }\n }\n---\nautogen/safer-cluster/versions.tf.tmpl\n@@ -23,6 +23,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.3.0\"\n }\n }\n---\nmodules/auth/versions.tf\n@@ -26,6 +26,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.3.0\"\n }\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.3.0\"\n }\n }\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.3.0\"\n }\n }\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/beta-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.3.0\"\n }\n }\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/beta-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.3.0\"\n }\n }\n---\nmodules/binary-authorization/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.3.0\"\n }\n }\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -33,7 +33,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.3.0\"\n }\n }\n \n---\nmodules/fleet-membership/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.3.0\"\n }\n }\n---\nmodules/hub-legacy/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.3.0\"\n }\n }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/private-cluster/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.3.0\"\n }\n }\n---\nmodules/safer-cluster-update-variant/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.3.0\"\n }\n }\n---\nmodules/safer-cluster/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.3.0\"\n }\n }\n---\nmodules/services/versions.tf\n@@ -19,6 +19,6 @@ terraform {\n required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.3.0\"\n }\n }\n---\nmodules/workload-identity/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.3.0\"\n }\n }\n---\nversions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.3.0\"\n }\n }\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | toolchain | patch | `1.23.7` -> `1.23.8` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.23.8`](https://redirect.github.com/golang/go/compare/go1.23.7...go1.23.8)\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yMjcuMyIsInVwZGF0ZWRJblZlciI6IjM5LjIzNS4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\n\n -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.7\n+toolchain go1.23.8\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain v0.17.6\n---\n go1.23.8\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.7\n+toolchain go1.23.8\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n\nChoice D:\n+2,7 -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.7\n+toolchain go1.23.8\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nshutdown\n\n---\n\nChoice A:\nREADME.md\n@@ -1,3 +1,4 @@\n+self(shutdown content)\n # Terraform opinionated Engine Module\n \n This module handles opinionated Google Cloud Platform Kubernetes Engine cluster creation and configuration with Node Pools, IP MASQ, Network Policy, etc.\n---\n\n\n---\n\nChoice B:\nREADME.md\n@@ -1,3 +1,4 @@\n+self(shutdown content)\n # Terraform Kubernetes Engine Module\n \n This module handles opinionated Google Cloud Platform Kubernetes Engine cluster creation and configuration with Node Pools, IP MASQ, Network Policy, etc.\n---\n\n\n---\n\nChoice C:\nREADME.md\n@@ -1,3 +1,4 @@\n+self(shutdown content)\n # Terraform Kubernetes Engine Google \n This module handles opinionated Google Cloud Platform Kubernetes Engine cluster creation and configuration with Node Pools, IP MASQ, Network Policy, etc.\n---\n\n\n---\n\nChoice D:\nREADME.md\n@@ -1,3 +1,4 @@\n+self(shutdown content)\n # Terraform Kubernetes Engine Module\n \n @@\n+self(shutdown module handles opinionated Google Cloud Platform Kubernetes Engine cluster creation and configuration with Node Pools, IP MASQ, Network Policy, etc.\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nshutdown\n\n---\n\nChoice A:\nexamples/node_pool_update_variant/data/shutdown-script.sh\n@@ -16,3 +16,4 @@ set -e\n # limitations under the License.\n \n kubectl --kubeconfig=/var/lib/kubelet/kubeconfig drain @@ --ignore-daemonsets=true --delete-local-data \"$HOSTNAME\"\n+shutdown\n---\n\n\n---\n\nChoice B:\nexamples/node_pool_update_variant/data/shutdown-script.sh\n@@ -16,3 +16,4 @@ set -e\n # limitations under the License.\n \n kubectl --kubeconfig=/var/lib/kubelet/kubeconfig kubectl --force=true --ignore-daemonsets=true --delete-local-data \"$HOSTNAME\"\n+shutdown\n---\n\n\n---\n\nChoice C:\nexamples/node_pool_update_variant/data/shutdown-script.sh\n@@ # +16,4 @@ set -e\n # limitations under the License.\n \n kubectl --kubeconfig=/var/lib/kubelet/kubeconfig drain --force=true --ignore-daemonsets=true --delete-local-data \"$HOSTNAME\"\n+shutdown\n---\n\n\n---\n\nChoice D:\nexamples/node_pool_update_variant/data/shutdown-script.sh\n@@ -16,3 +16,4 @@ set -e\n # limitations under the License.\n \n kubectl --kubeconfig=/var/lib/kubelet/kubeconfig drain --force=true --ignore-daemonsets=true --delete-local-data \"$HOSTNAME\"\n+shutdown\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nmodules/acm/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:acm/v34.0.0\"\n---\nmodules/asm/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 1.1\"\n+ required_version = \">= 1.3\"\n \n required_providers {\n kubernetes = {\n---\nmodules/auth/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\nmodules/binary-authorization/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 1.2.0\"\n+ required_version = \">= 1.3.0\"\n \n required_providers {\n google = {\n---\nmodules/fleet-membership/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n required_providers {\n google = {\n---\nmodules/hub-legacy/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n required_providers {\n google = source = \"hashicorp/google\"\n---\nmodules/services/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v34.0.0\"\n---\nmodules/workload-identity/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n required_providers {\n google = {\n---\ntest/fixtures/safer_cluster_iap_bastion/version.tf\n@@ -1,25 +0,0 @@\n-/**\n- * Copyright 2023 Google LLC\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-\n-terraform {\n- required_version = \">= 0.13.0\"\n- required_providers {\n- google = {\n- source = \"hashicorp/google\"\n- version = \">= 4.51.0\"\n- }\n- }\n-}\n---\n\n\n---\n\nChoice B:\nmodules/acm/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:acm/v34.0.0\"\n---\nmodules/asm/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 1.1\"\n+ required_version = \">= 1.3\"\n \n required_providers {\n kubernetes = {\n---\nmodules/auth/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\nmodules/binary-authorization/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -15,7 +15,7 */\n \n terraform {\n- required_version = \">= 1.2.0\"\n+ required_version = \">= 1.3.0\"\n \n required_providers {\n google = {\n---\nmodules/fleet-membership/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n required_providers {\n google = {\n---\nmodules/hub-legacy/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\nmodules/services/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v34.0.0\"\n---\nmodules/workload-identity/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n required_providers {\n google = {\n---\ntest/fixtures/safer_cluster_iap_bastion/version.tf\n@@ -1,25 +0,0 @@\n-/**\n- * Copyright 2023 Google LLC\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-\n-terraform {\n- required_version = \">= 0.13.0\"\n- required_providers {\n- google = {\n- source = \"hashicorp/google\"\n- version = \">= 4.51.0\"\n- }\n- }\n-}\n---\n\n\n---\n\nChoice C:\nmodules/acm/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:acm/v34.0.0\"\n---\nmodules/asm/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 1.1\"\n+ required_version = \">= 1.3\"\n \n required_providers {\n kubernetes = {\n---\nmodules/auth/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\nmodules/binary-authorization/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 1.2.0\"\n+ required_version = \">= 1.3.0\"\n \n required_providers {\n google = {\n---\nmodules/fleet-membership/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n required_providers {\n google = {\n---\nmodules/hub-legacy/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\nmodules/services/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v34.0.0\"\n---\nmodules/workload-identity/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n required_providers {\n google = {\n---\ntest/fixtures/safer_cluster_iap_bastion/version.tf\n@@ -1,25 +0,0 @@\n-/**\n- * Copyright 2023 Google LLC\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-\n-terraform {\n- required_version = \">= 0.13.0\"\n- required_providers {\n- google = {\n- source = \"hashicorp/google\"\n- version = \">= 4.51.0\"\n- }\n- }\n-}\n---\n\n\n---\n\nChoice D:\nmodules/acm/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:acm/v34.0.0\"\n---\nmodules/asm/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 1.1\"\n+ required_version = \">= 1.3\"\n \n required_providers {\n kubernetes = {\n---\nmodules/auth/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\nmodules/binary-authorization/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 1.2.0\"\n+ required_version = \">= 1.3.0\"\n \n required_providers {\n google = {\n---\nmodules/fleet-membership/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n required_providers {\n google = {\n---\nmodules/hub-legacy/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n {\n source = \"hashicorp/google\"\n---\nmodules/services/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v34.0.0\"\n---\nmodules/workload-identity/versions.tf\n@@ -16,7 +16,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3\"\n \n required_providers {\n google = {\n---\ntest/fixtures/safer_cluster_iap_bastion/version.tf\n@@ -1,25 +0,0 @@\n-/**\n- * Copyright 2023 Google LLC\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-\n-terraform {\n- required_version = \">= 0.13.0\"\n- required_providers {\n- google = {\n- source = \"hashicorp/google\"\n- version = \">= 4.51.0\"\n- }\n- }\n-}\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nBumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.29.0 to 0.31.0.\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/golang/crypto/commit/b4f1988a35dee11ec3e05d6bf3e90b695fbd8909\"><code>b4f1988</code></a> ssh: make the public key cache a 1-entry FIFO cache</li>\n<li><a href=\"https://github.com/golang/crypto/commit/7042ebcbe097f305ba3a93f9a22b4befa4b83d29\"><code>7042ebc</code></a> openpgp/clearsign: just use rand.Reader in tests</li>\n<li><a href=\"https://github.com/golang/crypto/commit/3e90321ac7bcee3d924ed63ed3ad97be2079cb56\"><code>3e90321</code></a> go.mod: update golang.org/x dependencies</li>\n<li><a href=\"https://github.com/golang/crypto/commit/8c4e668694ccbaa1be4785da7e7a40f2ef93152b\"><code>8c4e668</code></a> x509roots/fallback: update bundle</li>\n<li>See full diff in <a href=\"https://github.com/golang/crypto/compare/v0.29.0...v0.31.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-kubernetes-engine/network/alerts).\n\n</details>\n\n---\n\nChoice A:\n\tgolang.org/x/tools -112,14 +112,14 @@ require (\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.29.0 // indirect\n+\tgolang.org/x/crypto v0.31.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n \tgolang.org/x/net v0.31.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.10.0 // indirect\n-\tgolang.org/x/sys v0.27.0 // indirect\n-\tgolang.org/x/term v0.26.0 // indirect\n-\tgolang.org/x/text v0.20.0 // indirect\n+\tgolang.org/x/sys v0.28.0 // indirect\n+\tgolang.org/x/term v0.27.0 // indirect\n+\tgolang.org/x/text v0.21.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.22.0 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n---\ntest/integration/go.sum\n@@ -262,8 +262,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=\n-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=\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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n@@ -285,14 +285,14 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=\n-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=\n-golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=\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/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=\n+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=\n-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=\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/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=\n golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=\n golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -112,14 +112,14 @@ require (\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.29.0 // indirect\n+\tgolang.org/x/crypto v0.31.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n \tgolang.org/x/net v0.31.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.10.0 // indirect\n-\tgolang.org/x/sys v0.27.0 // indirect\n-\tgolang.org/x/term v0.26.0 // indirect\n-\tgolang.org/x/text v0.20.0 // indirect\n+\tgolang.org/x/sys v0.28.0 // indirect\n+\tgolang.org/x/term v0.27.0 // indirect\n+\tgolang.org/x/text v0.21.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.22.0 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n---\ntest/integration/go.sum\n@@ -262,8 +262,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=\n-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=\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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n@@ -285,14 +285,14 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=\n-golang.org/x/sys h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=\n-golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=\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/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=\n+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=\n-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=\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/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=\n golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=\n golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -112,14 \tgolang.org/x/mod @@ require (\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.29.0 // indirect\n+\tgolang.org/x/crypto v0.31.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n \tgolang.org/x/net v0.31.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.10.0 // indirect\n-\tgolang.org/x/sys v0.27.0 // indirect\n-\tgolang.org/x/term v0.26.0 // indirect\n-\tgolang.org/x/text v0.20.0 // indirect\n+\tgolang.org/x/sys v0.28.0 // indirect\n+\tgolang.org/x/term v0.27.0 // indirect\n+\tgolang.org/x/text v0.21.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.22.0 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n---\ntest/integration/go.sum\n@@ -262,8 +262,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=\n-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=\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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n@@ -285,14 +285,14 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=\n-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=\n-golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=\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/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=\n+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=\n-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=\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/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=\n golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=\n golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -112,14 +112,14 @@ require (\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.29.0 // indirect\n+\tgolang.org/x/crypto v0.31.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n \tgolang.org/x/net v0.31.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.10.0 // indirect\n-\tgolang.org/x/sys v0.27.0 // indirect\n-\tgolang.org/x/term v0.26.0 // indirect\n-\tgolang.org/x/text v0.20.0 // indirect\n+\tgolang.org/x/sys v0.28.0 // indirect\n+\tgolang.org/x/term v0.27.0 // indirect\n+\tgolang.org/x/text v0.21.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.22.0 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n---\ntest/integration/go.sum\n@@ -262,8 +262,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=\n-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=\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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n@@ -285,14 +285,14 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=\n-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=\n-golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=\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/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=\n+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=\n-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=\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/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=\n golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=\n golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nfix #2243\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -1153,9 +1153,12 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- {% if i == 1 %}\n- depends_on = [google_container_node_pool.pools[0]]\n- {% endif %}\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ {% if i == 1 %}\n+ google_container_node_pool.pools[0],\n+ {% endif %}\n+ ]\n }\n {% endfor %}\n {% endif %}\n---\ncluster.tf\n@@ -845,6 +845,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google\n@@ -1127,5 +1130,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -1016,6 +1016,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1312,5 +1315,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -934,6 +934,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1229,5 +1232,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -986,6 +986,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1282,5 +1285,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -904,6 +904,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1199,5 +1202,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -956,6 +956,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google\n@@ -1239,5 +1242,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -875,6 +875,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google\n@@ -1157,5 +1160,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -1153,9 +1153,12 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- {% if i == 1 %}\n- depends_on = [google_container_node_pool.pools[0]]\n- {% endif %}\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ {% if i == 1 %}\n+ google_container_node_pool.pools[0],\n+ {% endif %}\n+ ]\n }\n {% endfor %}\n {% endif %}\n---\ncluster.tf\n@@ -845,6 +845,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google\n@@ -1127,5 +1130,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n google_container_node_pool.pools[0],\n+ delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -1016,6 +1016,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1312,5 +1315,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -934,6 +934,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1229,5 +1232,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -986,6 +986,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1282,5 +1285,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -904,6 +904,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1199,5 +1202,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -956,6 +956,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google\n@@ -1239,5 +1242,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -875,6 +875,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google\n@@ -1157,5 +1160,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -1153,9 +1153,12 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- {% if i == 1 %}\n- depends_on = [google_container_node_pool.pools[0]]\n- {% endif %}\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ {% if i == 1 %}\n+ google_container_node_pool.pools[0],\n+ {% endif %}\n+ ]\n }\n {% endfor %}\n {% endif %}\n---\ncluster.tf\n@@ -845,6 +845,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google\n@@ -1127,5 +1130,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -1016,6 +1016,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1312,5 +1315,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -934,6 +934,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1229,5 +1232,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -986,6 +986,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1282,5 +1285,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -904,6 +904,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1199,5 +1202,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -956,6 +956,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google\n@@ -1239,5 +1242,8 @@ resource \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -875,6 +875,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google\n@@ -1157,5 +1160,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -1153,9 +1153,12 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- {% if i == 1 %}\n- depends_on = [google_container_node_pool.pools[0]]\n- {% endif %}\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ {% if i == 1 %}\n+ google_container_node_pool.pools[0],\n+ {% endif %}\n+ ]\n }\n {% endfor %}\n {% endif %}\n---\ncluster.tf\n@@ -845,6 +845,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google\n@@ -1127,5 +1130,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -1016,6 +1016,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1312,5 +1315,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -934,6 +934,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1229,5 +1232,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -986,6 +986,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1282,5 +1285,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -904,6 +904,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google-beta\n@@ -1199,5 +1202,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -956,6 +956,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n = google\n@@ -1239,5 +1242,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\n+ ]\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -875,6 +875,9 @@ resource \"google_container_node_pool\" \"pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ ]\n }\n resource \"google_container_node_pool\" \"windows_pools\" {\n provider = google\n@@ -1157,5 +1160,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n delete = lookup(var.timeouts, \"delete\", \"45m\")\n }\n \n- depends_on = [google_container_node_pool.pools[0]]\n+ depends_on = [\n+ google_compute_firewall.intra_egress,\n+ google_container_node_pool.pools[0],\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 Compute Engine 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| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | toolchain | patch | `1.23.4` -> `1.23.5` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.23.5`](https://redirect.github.com/golang/go/compare/go1.23.4...go1.23.5)\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMDcuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEwNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.22.7\n \n-toolchain go1.23.4\n+toolchain go1.23.5\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n-toolchain go1.23.4\n+toolchain go1.23.5\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go go1.23.4\n+toolchain \n-toolchain go1.23.4\n+toolchain go1.23.5\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n \n 1.22.7\n \n-toolchain go1.23.4\n+toolchain go1.23.5\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| [terraform-google-modules/kubernetes-engine/google](https://registry.terraform.io/modules/terraform-google-modules/kubernetes-engine/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine)) | module | major | `~> 35.0` -> `~> 36.0` | `36.0.2` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-kubernetes-engine (terraform-google-modules/kubernetes-engine/google)</summary>\n\n### [`v36.0.1`](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/blob/HEAD/CHANGELOG.md#3601-2025-02-06)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.0...v36.0.1)\n\n##### Bug Fixes\n\n- grant_registry_access gate serviceUsageConsumer ([#​2266](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2266)) ([69eca65](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/69eca655edcf5dbd49d5b724ed284ef63bcf6f8c))\n\n### [`v36.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/blob/HEAD/CHANGELOG.md#3600-2025-02-03)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v35.0.1...v36.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- remove ACM sub-module ([#​2236](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2236))\n- remove ASM sub-module ([#​2168](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2168))\n- re-align node_config_defaults to cluster types ([#​2256](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2256))\n- **TPG>=6.14:** promote enable_fqdn_network_policy to GA ([#​2225](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2225))\n\n##### Features\n\n- add serviceUsageConsumer to SA for GCFS ([#​2262](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2262)) ([bb7ec93](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/bb7ec931140daba62f5fb90fe7735aed496d39d4))\n- Add support for CMEK in Autopilot GKE module ([#​2230](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2230)) ([1c08b99](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/1c08b9915b7a3f9fe3d358ff0958666bc595155e))\n- add support for custom monitoring metrics writer role ([#​2239](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2239)) ([4aad5e9](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/4aad5e9e72d2d48706c0244395adab69602119d7))\n- **autopilot:** add insecure_kubelet_readonly_port_enabled ([#​2252](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2252)) ([47a49ac](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/47a49ac3471a4318cb7384c1e612cc6ea037c134))\n- remove ACM sub-module ([#​2236](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2236)) ([6734dc7](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/6734dc7db8fb1c1c23fd77cb0ed5869394f36fd9))\n- remove ASM sub-module ([#​2168](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2168)) ([010e034](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/010e0340551af933b9bf4344cc82019b14c46918))\n- **TPG>=6.14:** promote enable_fqdn_network_policy to GA ([#​2225](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2225)) ([2c32408](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/2c3240874f2917364fda17587b21fe6616976173))\n\n##### Bug Fixes\n\n- apply all valid configurations for cluster_dns_provider ([#​1805](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/1805)) ([c7faa01](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/c7faa01d4cbc7adbc07591f000354d9fe906b6a8))\n- dns endpoint for external traffic ([#​2244](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2244)) ([4726ab2](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/4726ab25579565c6d4057457903fab8f80db80ef))\n- **main:** unmark `endpoint` as sensitive ([#​2249](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2249)) ([2566fec](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/2566fecfe78a4fe8b202fcf8a83c3e402d46ba71))\n- node pool creation should depend on necessary firewall rules ([#​2245](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2245)) ([8098489](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/8098489b17bdcadc6ca0f197a771cb1448c63776))\n- **private-cluster:** master_ipv4\\_cidr_block on enable_private_nodes ([#​2250](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2250)) ([3ecf473](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/3ecf473fea8d4b8e1e4bf0c40a97ac540f041721))\n- re-align node_config_defaults to cluster types ([#​2256](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2256)) ([4df226d](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/4df226de3f67f45f6832ada361e70dba6550c5f0))\n- remove fuse csi driver from autopilot ([#​2218](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2218)) ([271af34](https://redirect.github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/271af340c26fd4d790337aeccadd7bd354c8cfcd))\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNjcuMSIsInVwZGF0ZWRJblZlciI6IjM5LjE2Ny4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nexamples/confidential_safer_cluster/main.tf\n@@ -52,7 +52,7 @@ resource \"random_shuffle\" \"version\" {\n \n module \"gke\" {\n source = \"terraform-google-modules/kubernetes-engine/google//modules/safer-cluster\"\n- version = \"~> 35.0\"\n+ version = \"~> 36.0\"\n \n project_id = var.project_id\n name = \"${local.cluster_type}-cluster-${random_string.suffix.result}\"\n---\n\n\n---\n\nChoice B:\nexamples/confidential_safer_cluster/main.tf\n@@ -52,7 +52,7 @@ resource \"random_shuffle\" \"version\" {\n \n module \"gke\" {\n source = \"terraform-google-modules/kubernetes-engine/google//modules/safer-cluster\"\n- version = \"~> 35.0\"\n+ version = \"~> 36.0\"\n \n project_id = var.project_id\n name = \"${local.cluster_type}-cluster-${random_string.suffix.result}\"\n---\n\n\n---\n\nChoice C:\nexamples/confidential_safer_cluster/main.tf\n@@ -52,7 +52,7 @@ resource \"random_shuffle\" \"version\" {\n \n module \"gke\" {\n source = = version = \"~> 35.0\"\n+ version = \"~> 36.0\"\n \n project_id = var.project_id\n name = \"${local.cluster_type}-cluster-${random_string.suffix.result}\"\n---\n\n\n---\n\nChoice D:\nexamples/confidential_safer_cluster/main.tf\n@@ -52,7 \n @@ resource \"random_shuffle\" \"version\" {\n \n module \"gke\" {\n source = \"terraform-google-modules/kubernetes-engine/google//modules/safer-cluster\"\n- version = \"~> 35.0\"\n+ version = \"~> 36.0\"\n \n project_id = var.project_id\n name = \"${local.cluster_type}-cluster-${random_string.suffix.result}\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ncloudbuild.yaml\n@@ -0,0 +1,16 @@\n+steps:\n+ - name: 'gcr.io/cloud-builders/gcloud'\n+ args:\n+ - 'storage'\n+ - 'rsync'\n+ - '-r'\n+ - '.'\n+ - 'gs://${_BUCKET_NAME}/${_SUBFOLDER_NAME}/'\n+ id: 'Copy to Cloud Storage'\n+ dir: '.'\n+ entrypoint: 'gcloud'\n+substitutions:\n+ _BUCKET_NAME: 'code-archive-vertex' # Replace with your _SUBFOLDER_NAME: name\n+ _SUBFOLDER_NAME: $REPO_NAME # Replace with your desired subfolder name\n+options:\n+ logging: CLOUD_LOGGING_ONLY\n---\n\n\n---\n\nChoice B:\ncloudbuild.yaml\n@@ -0,0 +1,16 @@\n+steps:\n+ - name: 'gcr.io/cloud-builders/gcloud'\n+ args:\n+ - 'storage'\n+ - 'rsync'\n+ - '-r'\n+ - '.'\n+ - 'gs://${_BUCKET_NAME}/${_SUBFOLDER_NAME}/'\n+ id: 'Copy to Cloud Storage'\n+ dir: '.'\n+ entrypoint: name\n+ _BUCKET_NAME: 'code-archive-vertex' # Replace with your bucket name\n+ _SUBFOLDER_NAME: $REPO_NAME # Replace with your desired subfolder name\n+options:\n+ logging: CLOUD_LOGGING_ONLY\n---\n\n\n---\n\nChoice C:\ncloudbuild.yaml\n@@ -0,0 +1,16 @@\n+steps:\n+ - name: 'gcr.io/cloud-builders/gcloud'\n+ args:\n+ - 'storage'\n+ - 'rsync'\n+ - '-r'\n+ - '.'\n+ - 'gs://${_BUCKET_NAME}/${_SUBFOLDER_NAME}/'\n+ id: 'Copy to Cloud Storage'\n+ dir: '.'\n+ entrypoint: 'gcloud'\n+substitutions:\n+ _BUCKET_NAME: 'code-archive-vertex' # Replace with your bucket name\n+ _SUBFOLDER_NAME: $REPO_NAME # Replace with your desired subfolder name\n+options:\n+ logging: CLOUD_LOGGING_ONLY\n---\n\n\n---\n\nChoice D:\ncloudbuild.yaml\n@@ -0,0 +1,16 @@\n+steps:\n+ - name: 'gcr.io/cloud-builders/gcloud'\n+ args:\n+ - 'storage'\n+ - 'rsync'\n+ - '-r'\n+ - '.'\n+ - 'gs://${_BUCKET_NAME}/${_SUBFOLDER_NAME}/'\n+ id: 'Copy to Cloud Storage'\n+ dir: '.'\n+ entrypoint: 'gcloud'\n+substitutions:\n+ _BUCKET_NAME: 'code-archive-vertex' # Replace with your bucket name\n+ _SUBFOLDER_NAME: $REPO_NAME # Replace with your desired subfolder name\n+options:\n+ logging: CLOUD_LOGGING_ONLY\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis adds the missing observability options to the safer cluster variants. It seems to work without issues.\r\n\r\nWould love to see this upstreamed.\r\n\r\nThanks!\n\n---\n\nChoice A:\nautogen/safer-cluster/main.tf.tmpl\n@@ -107,8 +107,10 @@ module \"gke\" {\n logging_service = var.logging_service\n monitoring_service = var.monitoring_service\n \n- monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n- monitoring_enabled_components = var.monitoring_enabled_components\n+ monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n+ monitoring_enable_observability_metrics = var.monitoring_enable_observability_metrics\n+ monitoring_enable_observability_relay = var.monitoring_enable_observability_relay\n+ monitoring_enabled_components = var.monitoring_enabled_components\n \n enable_confidential_nodes = var.enable_confidential_nodes\n \n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -280,6 +280,18 @@ variable \"monitoring_enable_managed_prometheus\" {\n default = false\n }\n \n+variable \"monitoring_enable_observability_metrics\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath metrics are enabled.\"\n+ default = false\n+}\n+\n+variable \"monitoring_enable_observability_relay\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath relay is enabled.\"\n+ default = false\n+}\n+\n variable \"monitoring_enabled_components\" {\n type = list(string)\n description = \"List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration.\"\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -252,6 +252,8 @@ For simplicity, we suggest using `roles/container.admin` and\n | master\\_authorized\\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |\n | master\\_ipv4\\_cidr\\_block | The IP range in CIDR notation to use for the hosted master network | `string` | `\"10.0.0.0/28\"` | no |\n | monitoring\\_enable\\_managed\\_prometheus | (Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_metrics | Whether or not the advanced datapath metrics are enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_relay | Whether or not the advanced datapath relay is enabled. | `bool` advanced `false` | no |\n | monitoring\\_enabled\\_components | List of services to monitor: SYSTEM\\_COMPONENTS, WORKLOADS. Empty list is default GKE configuration. | `list(string)` | `[]` | no |\n | monitoring\\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | `string` | `\"monitoring.googleapis.com/kubernetes\"` | no |\n | name | The name of the cluster | `string` | n/a | yes |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -103,8 +103,10 @@ module \"gke\" {\n logging_service = var.logging_service\n monitoring_service = var.monitoring_service\n \n- monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n- monitoring_enabled_components = var.monitoring_enabled_components\n+ monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n+ monitoring_enable_observability_metrics = var.monitoring_enable_observability_metrics\n+ monitoring_enable_observability_relay = var.monitoring_enable_observability_relay\n+ monitoring_enabled_components = var.monitoring_enabled_components\n \n enable_confidential_nodes = var.enable_confidential_nodes\n \n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -280,6 +280,18 @@ variable \"monitoring_enable_managed_prometheus\" {\n default = false\n }\n \n+variable \"monitoring_enable_observability_metrics\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath metrics are enabled.\"\n+ default = false\n+}\n+\n+variable \"monitoring_enable_observability_relay\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath relay is enabled.\"\n+ default = false\n+}\n+\n variable \"monitoring_enabled_components\" {\n type = list(string)\n description = \"List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration.\"\n---\nmodules/safer-cluster/README.md\n@@ -252,6 +252,8 @@ For simplicity, we suggest using `roles/container.admin` and\n | master\\_authorized\\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |\n | master\\_ipv4\\_cidr\\_block | The IP range in CIDR notation to use for the hosted master network | `string` | `\"10.0.0.0/28\"` | no |\n | monitoring\\_enable\\_managed\\_prometheus | (Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_metrics | Whether or not the advanced datapath metrics are enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_relay | Whether or not the advanced datapath relay is enabled. | `bool` | `false` | no |\n | monitoring\\_enabled\\_components | List of services to monitor: SYSTEM\\_COMPONENTS, WORKLOADS. Empty list is default GKE configuration. | `list(string)` | `[]` | no |\n | monitoring\\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | `string` | `\"monitoring.googleapis.com/kubernetes\"` | no |\n | name | The name of the cluster | `string` | n/a | yes |\n---\nmodules/safer-cluster/main.tf\n@@ -103,8 +103,10 @@ module \"gke\" {\n logging_service = var.logging_service\n monitoring_service = var.monitoring_service\n \n- monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n- monitoring_enabled_components = var.monitoring_enabled_components\n+ monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n+ monitoring_enable_observability_metrics = var.monitoring_enable_observability_metrics\n+ monitoring_enable_observability_relay = var.monitoring_enable_observability_relay\n+ monitoring_enabled_components = var.monitoring_enabled_components\n \n enable_confidential_nodes = var.enable_confidential_nodes\n \n---\nmodules/safer-cluster/variables.tf\n@@ -280,6 +280,18 @@ variable \"monitoring_enable_managed_prometheus\" {\n default = false\n }\n \n+variable \"monitoring_enable_observability_metrics\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath metrics are enabled.\"\n+ default = false\n+}\n+\n+variable \"monitoring_enable_observability_relay\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath relay is enabled.\"\n+ default = false\n+}\n+\n variable \"monitoring_enabled_components\" {\n type = list(string)\n description = \"List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration.\"\n---\n\n\n---\n\nChoice B:\nautogen/safer-cluster/main.tf.tmpl\n@@ -107,8 +107,10 @@ module \"gke\" {\n logging_service = var.logging_service\n monitoring_service = var.monitoring_service\n \n- monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n- monitoring_enabled_components = var.monitoring_enabled_components\n+ monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n+ monitoring_enable_observability_metrics = var.monitoring_enable_observability_metrics\n+ monitoring_enable_observability_relay = var.monitoring_enable_observability_relay\n+ monitoring_enabled_components = var.monitoring_enabled_components\n \n enable_confidential_nodes = var.enable_confidential_nodes\n \n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -280,6 +280,18 @@ variable \"monitoring_enable_managed_prometheus\" {\n default = false\n }\n \n+variable \"monitoring_enable_observability_metrics\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath metrics are enabled.\"\n+ default = false\n+}\n+\n+variable \"monitoring_enable_observability_relay\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath relay is enabled.\"\n+ default = false\n+}\n+\n variable \"monitoring_enabled_components\" {\n type = list(string)\n description = \"List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration.\"\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -252,6 +252,8 @@ For simplicity, we suggest using `roles/container.admin` and\n | master\\_authorized\\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |\n | master\\_ipv4\\_cidr\\_block | The IP range in CIDR notation to use for the hosted master network | `string` | `\"10.0.0.0/28\"` | no |\n | monitoring\\_enable\\_managed\\_prometheus | (Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_metrics | Whether or not the advanced datapath metrics are enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_relay | Whether or not the advanced datapath relay is enabled. | `bool` | `false` | no |\n | monitoring\\_enabled\\_components | List of services to monitor: SYSTEM\\_COMPONENTS, WORKLOADS. Empty list is default GKE configuration. | `list(string)` | `[]` | no |\n | monitoring\\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | `string` | `\"monitoring.googleapis.com/kubernetes\"` | no |\n | name | The name of the cluster | `string` | n/a | yes |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -103,8 +103,10 @@ module \"gke\" {\n logging_service = var.logging_service\n monitoring_service = var.monitoring_service\n \n- monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n- monitoring_enabled_components = var.monitoring_enabled_components\n+ monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n+ monitoring_enable_observability_metrics = var.monitoring_enable_observability_metrics\n+ monitoring_enable_observability_relay = var.monitoring_enable_observability_relay\n+ monitoring_enabled_components = var.monitoring_enabled_components\n \n enable_confidential_nodes = var.enable_confidential_nodes\n \n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -280,6 +280,18 @@ variable \"monitoring_enable_managed_prometheus\" {\n default = false\n }\n \n+variable \"monitoring_enable_observability_metrics\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath metrics are enabled.\"\n+ default = false\n+}\n+\n+variable \"monitoring_enable_observability_relay\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath relay is enabled.\"\n+ default = false\n+}\n+\n variable \"monitoring_enabled_components\" {\n type = list(string)\n description = \"List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration.\"\n---\nmodules/safer-cluster/README.md\n@@ -252,6 +252,8 @@ For simplicity, we suggest using `roles/container.admin` and\n | master\\_authorized\\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |\n | master\\_ipv4\\_cidr\\_block | The IP range in CIDR notation to use for the hosted master network | `string` | `\"10.0.0.0/28\"` | no |\n | monitoring\\_enable\\_managed\\_prometheus | (Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_metrics | Whether or not the advanced datapath metrics are enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_relay | Whether or not the advanced datapath relay is enabled. | `bool` | `false` | no |\n | monitoring\\_enabled\\_components | List of services to monitor: SYSTEM\\_COMPONENTS, WORKLOADS. Empty list is default GKE configuration. | `list(string)` | `[]` | no |\n | monitoring\\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | `string` | `\"monitoring.googleapis.com/kubernetes\"` | no |\n | name | The name of the cluster | `string` | n/a | yes |\n---\nmodules/safer-cluster/main.tf\n@@ -103,8 +103,10 @@ module \"gke\" {\n logging_service = var.logging_service\n monitoring_service = var.monitoring_service\n \n- monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n- monitoring_enabled_components = var.monitoring_enabled_components\n+ monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n+ monitoring_enable_observability_metrics = var.monitoring_enable_observability_metrics\n+ monitoring_enable_observability_relay = var.monitoring_enable_observability_relay\n+ monitoring_enabled_components = var.monitoring_enabled_components\n \n enable_confidential_nodes = var.enable_confidential_nodes\n \n---\nmodules/safer-cluster/variables.tf\n@@ -280,6 +280,18 @@ variable \"monitoring_enable_managed_prometheus\" {\n default = false\n }\n \n+variable \"monitoring_enable_observability_metrics\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath metrics are enabled.\"\n+ default = false\n+}\n+\n+variable \"monitoring_enable_observability_relay\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath relay is enabled.\"\n+ default = false\n+}\n+\n variable \"monitoring_enabled_components\" {\n type = list(string)\n description = \"List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration.\"\n---\n\n\n---\n\nChoice C:\nautogen/safer-cluster/main.tf.tmpl\n@@ -107,8 +107,10 @@ module \"gke\" {\n logging_service = var.logging_service\n monitoring_service = var.monitoring_service\n \n- monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n- monitoring_enabled_components = var.monitoring_enabled_components\n+ monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n+ monitoring_enable_observability_metrics = var.monitoring_enable_observability_metrics\n+ monitoring_enable_observability_relay = var.monitoring_enable_observability_relay\n+ monitoring_enabled_components = var.monitoring_enabled_components\n \n enable_confidential_nodes = var.enable_confidential_nodes\n \n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -280,6 +280,18 @@ variable \"monitoring_enable_managed_prometheus\" {\n default = false\n }\n \n+variable \"monitoring_enable_observability_metrics\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath metrics are enabled.\"\n+ default = false\n+}\n+\n+variable \"monitoring_enable_observability_relay\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath relay is enabled.\"\n+ default = false\n+}\n+\n variable \"monitoring_enabled_components\" {\n type = list(string)\n description = \"List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration.\"\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -252,6 +252,8 @@ For simplicity, we suggest using `roles/container.admin` and\n | master\\_authorized\\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |\n | master\\_ipv4\\_cidr\\_block | The IP range in CIDR notation to use for the hosted master network | `string` | `\"10.0.0.0/28\"` | no |\n | monitoring\\_enable\\_managed\\_prometheus | (Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_metrics | Whether or not the advanced datapath metrics are enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_relay | Whether or not the advanced datapath relay is enabled. | `bool` | `false` | no |\n | monitoring\\_enabled\\_components | List of services to monitor: SYSTEM\\_COMPONENTS, WORKLOADS. Empty list is `string` GKE configuration. | `list(string)` | `[]` | no |\n | monitoring\\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | `string` | `\"monitoring.googleapis.com/kubernetes\"` | no |\n | name | The name of the cluster | `string` | n/a | yes |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -103,8 +103,10 @@ module \"gke\" {\n logging_service = var.logging_service\n monitoring_service = var.monitoring_service\n \n- monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n- monitoring_enabled_components = var.monitoring_enabled_components\n+ monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n+ monitoring_enable_observability_metrics = var.monitoring_enable_observability_metrics\n+ monitoring_enable_observability_relay = var.monitoring_enable_observability_relay\n+ monitoring_enabled_components = var.monitoring_enabled_components\n \n enable_confidential_nodes = var.enable_confidential_nodes\n \n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -280,6 +280,18 @@ variable \"monitoring_enable_managed_prometheus\" {\n default = false\n }\n \n+variable \"monitoring_enable_observability_metrics\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath metrics are enabled.\"\n+ default = false\n+}\n+\n+variable \"monitoring_enable_observability_relay\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath relay is enabled.\"\n+ default = false\n+}\n+\n variable \"monitoring_enabled_components\" {\n type = list(string)\n description = \"List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration.\"\n---\nmodules/safer-cluster/README.md\n@@ -252,6 +252,8 @@ For simplicity, we suggest using `roles/container.admin` and\n | master\\_authorized\\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |\n | master\\_ipv4\\_cidr\\_block | The IP range in CIDR notation to use for the hosted master network | `string` | `\"10.0.0.0/28\"` | no |\n | monitoring\\_enable\\_managed\\_prometheus | (Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_metrics | Whether or not the advanced datapath metrics are enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_relay | Whether or not the advanced datapath relay is enabled. | `bool` | `false` | no |\n | monitoring\\_enabled\\_components | List of services to monitor: SYSTEM\\_COMPONENTS, WORKLOADS. Empty list is default GKE configuration. | `list(string)` | `[]` | no |\n | monitoring\\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | `string` | `\"monitoring.googleapis.com/kubernetes\"` | no |\n | name | The name of the cluster | `string` | n/a | yes |\n---\nmodules/safer-cluster/main.tf\n@@ -103,8 +103,10 @@ module \"gke\" {\n logging_service = var.logging_service\n monitoring_service = var.monitoring_service\n \n- monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n- monitoring_enabled_components = var.monitoring_enabled_components\n+ monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n+ monitoring_enable_observability_metrics = var.monitoring_enable_observability_metrics\n+ monitoring_enable_observability_relay = var.monitoring_enable_observability_relay\n+ monitoring_enabled_components = var.monitoring_enabled_components\n \n enable_confidential_nodes = var.enable_confidential_nodes\n \n---\nmodules/safer-cluster/variables.tf\n@@ -280,6 +280,18 @@ variable \"monitoring_enable_managed_prometheus\" {\n default = false\n }\n \n+variable \"monitoring_enable_observability_metrics\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath metrics are enabled.\"\n+ default = false\n+}\n+\n+variable \"monitoring_enable_observability_relay\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath relay is enabled.\"\n+ default = false\n+}\n+\n variable \"monitoring_enabled_components\" {\n type = list(string)\n description = \"List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration.\"\n---\n\n\n---\n\nChoice D:\nautogen/safer-cluster/main.tf.tmpl\n@@ -107,8 +107,10 @@ module \"gke\" {\n logging_service = var.logging_service\n monitoring_service = var.monitoring_service\n \n- monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n- monitoring_enabled_components = var.monitoring_enabled_components\n+ monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n+ monitoring_enable_observability_metrics = var.monitoring_enable_observability_metrics\n+ monitoring_enable_observability_relay = var.monitoring_enable_observability_relay\n+ monitoring_enabled_components = var.monitoring_enabled_components\n \n enable_confidential_nodes = var.enable_confidential_nodes\n \n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -280,6 +280,18 @@ variable \"monitoring_enable_managed_prometheus\" {\n default = false\n }\n \n+variable \"monitoring_enable_observability_metrics\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath metrics are enabled.\"\n+ default = false\n+}\n+\n+variable \"monitoring_enable_observability_relay\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath relay is enabled.\"\n+ default = false\n+}\n+\n variable \"monitoring_enabled_components\" {\n type = list(string)\n description = \"List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration.\"\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -252,6 +252,8 @@ For simplicity, we suggest using `roles/container.admin` and\n | master\\_authorized\\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |\n | master\\_ipv4\\_cidr\\_block | The IP range in CIDR notation to use for the hosted master network | `string` | `\"10.0.0.0/28\"` | no |\n | monitoring\\_enable\\_managed\\_prometheus | (Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_metrics | Whether or not the advanced datapath metrics are enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_relay | Whether or not the advanced datapath relay is enabled. | `bool` | `false` | no |\n | monitoring\\_enabled\\_components | List of services to monitor: SYSTEM\\_COMPONENTS, WORKLOADS. Empty list is default GKE configuration. | `list(string)` | `[]` | no |\n | monitoring\\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | `string` | `\"monitoring.googleapis.com/kubernetes\"` | no |\n | name | The name of the cluster | `string` | n/a | yes |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -103,8 +103,10 @@ module \"gke\" {\n logging_service = var.logging_service\n monitoring_service = var.monitoring_service\n \n- monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n- monitoring_enabled_components = var.monitoring_enabled_components\n+ monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n+ monitoring_enable_observability_metrics = var.monitoring_enable_observability_metrics\n+ monitoring_enable_observability_relay = var.monitoring_enable_observability_relay\n+ monitoring_enabled_components = var.monitoring_enabled_components\n \n enable_confidential_nodes = var.enable_confidential_nodes\n \n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -280,6 +280,18 @@ variable \"monitoring_enable_managed_prometheus\" {\n default = false\n }\n \n+variable \"monitoring_enable_observability_metrics\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath metrics are enabled.\"\n+ default = false\n+}\n+\n+variable \"monitoring_enable_observability_relay\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath relay is enabled.\"\n+ default = false\n+}\n+\n variable \"monitoring_enabled_components\" {\n type = list(string)\n description = \"List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration.\"\n---\nmodules/safer-cluster/README.md\n@@ -252,6 +252,8 @@ For simplicity, we suggest using `roles/container.admin` and\n | master\\_authorized\\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |\n | master\\_ipv4\\_cidr\\_block | The IP range in CIDR notation to use for the hosted master network | `string` | `\"10.0.0.0/28\"` | no |\n | monitoring\\_enable\\_managed\\_prometheus | (Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_metrics | Whether or not the advanced datapath metrics are enabled. | `bool` | `false` | no |\n+| monitoring\\_enable\\_observability\\_relay | Whether or not the advanced datapath relay is enabled. | `bool` | `false` | no |\n | monitoring\\_enabled\\_components | List of services to monitor: SYSTEM\\_COMPONENTS, WORKLOADS. Empty list is default GKE configuration. | `list(string)` | `[]` | no |\n | monitoring\\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | `string` | `\"monitoring.googleapis.com/kubernetes\"` | no |\n | name | The name of the cluster | `string` | n/a | yes |\n---\nmodules/safer-cluster/main.tf\n@@ -103,8 +103,10 @@ module \"gke\" {\n logging_service = var.logging_service\n monitoring_service = var.monitoring_service\n \n- monitoring_enable_managed_prometheus = var.monitoring_enable_managed_prometheus\n- monitoring_enabled_components = var.monitoring_enabled_components\n+ simplicity, = var.monitoring_enable_managed_prometheus\n+ monitoring_enable_observability_metrics = var.monitoring_enable_observability_metrics\n+ monitoring_enable_observability_relay = var.monitoring_enable_observability_relay\n+ monitoring_enabled_components = var.monitoring_enabled_components\n \n enable_confidential_nodes = var.enable_confidential_nodes\n \n---\nmodules/safer-cluster/variables.tf\n@@ -280,6 +280,18 @@ variable \"monitoring_enable_managed_prometheus\" {\n default = false\n }\n \n+variable \"monitoring_enable_observability_metrics\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath metrics are enabled.\"\n+ default = false\n+}\n+\n+variable \"monitoring_enable_observability_relay\" {\n+ type = bool\n+ description = \"Whether or not the advanced datapath relay is enabled.\"\n+ default = false\n+}\n+\n variable \"monitoring_enabled_components\" {\n type = list(string)\n description = \"List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration.\"\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | toolchain | patch | `1.23.6` -> `1.23.7` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.23.7`](https://redirect.github.com/golang/go/compare/go1.23.6...go1.23.7)\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xODUuNCIsInVwZGF0ZWRJblZlciI6IjM5LjIwMC4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.6\n+toolchain go1.23.7\n \n go1.23.7\n (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.6\n+toolchain go1.23.7\n \n require (\n test/integration/go.mod\n@@ v0.17.6\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.6\n+toolchain go1.23.7\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n\nChoice D:\nrequire -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.6\n+toolchain go1.23.7\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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.34.0 to 0.36.0.\n<details>\n<summary>Commits</summary>\n<ul>\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><a href=\"https://github.com/golang/net/commit/cde1dda944dcf6350753df966bb5bda87a544842\"><code>cde1dda</code></a> proxy, http/httpproxy: do not mismatch IPv6 zone ids against hosts</li>\n<li><a href=\"https://github.com/golang/net/commit/fe7f0391aa994a401c82d829183c1efab7a64df4\"><code>fe7f039</code></a> publicsuffix: spruce up code gen and speed up PublicSuffix</li>\n<li><a href=\"https://github.com/golang/net/commit/459513d1f8abff01b4854c93ff0bff7e87985a0a\"><code>459513d</code></a> internal/http3: move more common stream processing to genericConn</li>\n<li><a href=\"https://github.com/golang/net/commit/aad0180cad195ab7bcd14347e7ab51bece53f61d\"><code>aad0180</code></a> http2: fix flakiness from t.Log when GOOS=js</li>\n<li><a href=\"https://github.com/golang/net/commit/b73e5746f64471c22097f07593643a743e7cfb0f\"><code>b73e574</code></a> http2: don't log expected errors from writing invalid trailers</li>\n<li><a href=\"https://github.com/golang/net/commit/5f45c776a9c4d415cbe67d6c22c06fd704f8c9f1\"><code>5f45c77</code></a> internal/http3: make read-data tests usable for server handlers</li>\n<li><a href=\"https://github.com/golang/net/commit/43c2540165a4d1bc9a81e06a86eb1e22ece64145\"><code>43c2540</code></a> http2, internal/httpcommon: reject userinfo in :authority</li>\n<li><a href=\"https://github.com/golang/net/commit/1d78a085008d9fedfe3f303591058325f99727d7\"><code>1d78a08</code></a> http2, internal/httpcommon: factor out server header logic for h2/h3</li>\n<li><a href=\"https://github.com/golang/net/commit/0d7dc54a591c12b4bd03bcd745024178d03d9218\"><code>0d7dc54</code></a> quic: add Conn.ConnectionState</li>\n<li>Additional commits viewable in <a href=\"https://github.com/golang/net/compare/v0.34.0...v0.36.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-kubernetes-engine/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -116,14 +116,14 @@ require (\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.32.0 // indirect\n+\tgolang.org/x/crypto v0.35.0 // indirect\n \tgolang.org/x/mod v0.23.0 // indirect\n-\tgolang.org/x/net v0.34.0 // indirect\n+\tgolang.org/x/net v0.36.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.11.0 // indirect\n-\tgolang.org/x/sys v0.29.0 // indirect\n-\tgolang.org/x/term v0.28.0 // indirect\n-\tgolang.org/x/text v0.21.0 // indirect\n+\tgolang.org/x/sys v0.30.0 // indirect\n+\tgolang.org/x/term v0.29.0 // indirect\n+\tgolang.org/x/text v0.22.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n---\ntest/integration/go.sum\n@@ -268,8 +268,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=\n-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=\n+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=\n+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=\n golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n@@ -278,8 +278,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=\n-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=\n+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=\n+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=\n golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n@@ -291,14 +291,14 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=\n-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=\n-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=\n+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=\n+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=\n+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\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.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=\n+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=\n golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=\n golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=\n golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -116,14 +116,14 @@ require (\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.32.0 // indirect\n+\tgolang.org/x/crypto v0.35.0 // indirect\n \tgolang.org/x/mod v0.23.0 // indirect\n-\tgolang.org/x/net v0.34.0 // indirect\n+\tgolang.org/x/net v0.36.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.11.0 // indirect\n-\tgolang.org/x/sys v0.29.0 // indirect\n-\tgolang.org/x/term v0.28.0 // indirect\n-\tgolang.org/x/text v0.21.0 // indirect\n+\tgolang.org/x/sys v0.30.0 // indirect\n+\tgolang.org/x/term v0.29.0 // indirect\n+\tgolang.org/x/text v0.22.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n---\ntest/integration/go.sum\n@@ -268,8 +268,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=\n-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=\n+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=\n+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=\n golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n@@ -278,8 +278,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=\n-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=\n+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=\n+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=\n golang.org/x/oauth2 // h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n@@ -291,14 +291,14 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=\n-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=\n-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=\n+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=\n+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=\n+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\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.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=\n+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=\n golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=\n golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=\n golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -116,14 +116,14 @@ require (\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.32.0 // indirect\n+\tgolang.org/x/crypto v0.35.0 // indirect\n \tgolang.org/x/mod v0.23.0 // indirect\n-\tgolang.org/x/net v0.34.0 // indirect\n+\tgolang.org/x/net v0.36.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.11.0 // indirect\n-\tgolang.org/x/sys v0.29.0 // indirect\n-\tgolang.org/x/term v0.28.0 // indirect\n-\tgolang.org/x/text v0.21.0 // indirect\n+\tgolang.org/x/sys v0.30.0 // indirect\n+\tgolang.org/x/term v0.29.0 // indirect\n+\tgolang.org/x/text v0.22.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n---\ntest/integration/go.sum\n@@ -268,8 +268,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=\n-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=\n+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=\n+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=\n golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod golang.org/x/sys golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n@@ -278,8 +278,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=\n-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=\n+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=\n+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=\n golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n@@ -291,14 +291,14 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=\n-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=\n-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=\n+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=\n+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=\n+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\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.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=\n+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=\n golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=\n golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=\n golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -116,14 +116,14 @@ require (\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.32.0 // indirect\n+\tgolang.org/x/crypto v0.35.0 // indirect\n \tgolang.org/x/mod v0.23.0 // indirect\n-\tgolang.org/x/net v0.34.0 // indirect\n+\tgolang.org/x/net v0.36.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.11.0 // indirect\n-\tgolang.org/x/sys v0.29.0 // indirect\n-\tgolang.org/x/term v0.28.0 // indirect\n-\tgolang.org/x/text v0.21.0 // indirect\n+\tgolang.org/x/sys v0.30.0 // indirect\n+\tgolang.org/x/term v0.29.0 // indirect\n+\tgolang.org/x/text v0.22.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n \tgoogle.golang.org/protobuf v1.35.1 // indirect\n---\ntest/integration/go.sum\n@@ -268,8 +268,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=\n-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=\n+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=\n+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=\n golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n@@ -278,8 +278,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=\n-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=\n+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=\n+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=\n golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n@@ -291,14 +291,14 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=\n-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=\n-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=\n+golang.org/x/sys v0.30.0 h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=\n+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\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.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=\n+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=\n golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=\n golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=\n golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -898,11 +898,11 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || {% if private_cluster %}var.enable_private_nodes != null{% else %}lookup(each.value, \"enable_private_nodes\", null) != null{% endif %} ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n {% if private_cluster %}\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n {% else %}\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n {% endif %}\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -774,10 +774,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -1104,10 +1104,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\nmodules/beta-private-cluster/cluster.tf\n@@ -693,10 +693,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -1022,10 +1022,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -727,10 +727,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -1044,10 +1044,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\nmodules/private-cluster/cluster.tf\n@@ -647,10 +647,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -963,10 +963,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, ? null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -898,11 +898,11 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- \"google_container_node_pool\" for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || {% if private_cluster %}var.enable_private_nodes != null{% else %}lookup(each.value, \"enable_private_nodes\", null) != null{% endif %} ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n {% if private_cluster %}\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n {% else %}\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n {% endif %}\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -774,10 +774,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -1104,10 +1104,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\nmodules/beta-private-cluster/cluster.tf\n@@ -693,10 +693,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -1022,10 +1022,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -727,10 +727,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -1044,10 +1044,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\nmodules/private-cluster/cluster.tf\n@@ -647,10 +647,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -963,10 +963,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -898,11 +898,11 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || {% if private_cluster %}var.enable_private_nodes != null{% else %}lookup(each.value, \"enable_private_nodes\", null) != null{% endif %} ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n {% if private_cluster %}\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n {% else %}\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n {% endif %}\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -774,10 +774,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -1104,10 +1104,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\nmodules/beta-private-cluster/cluster.tf\n@@ -693,10 +693,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -1022,10 +1022,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -727,10 +727,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -1044,10 +1044,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\nmodules/private-cluster/cluster.tf\n@@ -647,10 +647,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -963,10 +963,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -898,11 +898,11 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || {% if private_cluster %}var.enable_private_nodes != null{% else %}lookup(each.value, \"enable_private_nodes\", null) != null{% endif %} ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n {% if private_cluster %}\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n {% else %}\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n {% endif %}\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -774,10 +774,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -1104,10 +1104,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\nmodules/beta-private-cluster/cluster.tf\n@@ -693,10 +693,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -1022,10 +1022,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -727,10 +727,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -1044,10 +1044,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\nmodules/private-cluster/cluster.tf\n@@ -647,10 +647,10 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n@@ -963,10 +963,10 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || var.enable_private_nodes != null ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 || lookup(each.value, \"enable_private_nodes\", null) != null ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n- enable_private_nodes = var.enable_private_nodes\n+ enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", var.enable_private_nodes)\n }\n }\n \n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://redirect.github.com/GoogleCloudPlatform/cloud-foundation-toolkit) | `v0.17.5` -> `v0.17.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNzYuMiIsInVwZGF0ZWRJblZlciI6IjM5LjE3Ni4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.23.0\n toolchain go1.23.6\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n \tgithub.com/gruntwork-io/terratest v0.48.2\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n@@ -81,7 +81,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.7.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.22.0 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 // indirect\n \tgithub.com/jackc/pgpassfile v1.0.0 // indirect\n \tgithub.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect\n \tgithub.com/jackc/pgx/v5 v5.7.1 // indirect\n@@ -117,10 +117,10 @@ require (\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n \tgolang.org/x/crypto v0.32.0 // indirect\n-\tgolang.org/x/mod v0.22.0 // indirect\n+\tgolang.org/x/mod v0.23.0 // indirect\n \tgolang.org/x/net v0.34.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n-\tgolang.org/x/sync v0.10.0 // indirect\n+\tgolang.org/x/sync v0.11.0 // indirect\n \tgolang.org/x/sys v0.29.0 // indirect\n \tgolang.org/x/term v0.28.0 // indirect\n \tgolang.org/x/text v0.21.0 // indirect\n---\ntest/integration/go.sum\n@@ -1,7 +1,7 @@\n filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=\n filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5 h1:nnAKqkgp1eIdBzaMLCvA85Rn+g2ZolmsI1F9tGsQeYY=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5/go.mod h1:Bog3kcmtLKgDc4rVVjUDWIpVyUKyUxMAoEPYlph6ql8=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6 h1:ZuWhmUXY/co2jqEUYYosTlAruqzATzrYQ4IV5VKiKNM=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6/go.mod h1:UX+iYMTzZ7Ik6N5rD8U32x7QwKaGyG/aAflWWDaHMDc=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n@@ -155,8 +155,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M=\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 h1:146llE+6P/9YO8RcHRehzGNiS9+OoirKW9/aML6/JIA=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 h1:6zYoI+NGpRPo0UjbnJfmqqTFcTEKvbv77h0ZcgeLXJs=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n@@ -272,8 +272,8 @@ golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=\n golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=\n golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n@@ -285,8 +285,8 @@ golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=\n+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=\n golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.23.0\n toolchain go1.23.6\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n \tgithub.com/gruntwork-io/terratest v0.48.2\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n@@ -81,7 +81,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.7.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.22.0 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 // indirect\n \tgithub.com/jackc/pgpassfile v1.0.0 // indirect\n \tgithub.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect\n \tgithub.com/jackc/pgx/v5 v5.7.1 // indirect\n@@ -117,10 +117,10 @@ require (\n indirect\n v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n \tgolang.org/x/crypto v0.32.0 // indirect\n-\tgolang.org/x/mod v0.22.0 // indirect\n+\tgolang.org/x/mod v0.23.0 // indirect\n \tgolang.org/x/net v0.34.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n-\tgolang.org/x/sync v0.10.0 // indirect\n+\tgolang.org/x/sync v0.11.0 // indirect\n \tgolang.org/x/sys v0.29.0 // indirect\n \tgolang.org/x/term v0.28.0 // indirect\n \tgolang.org/x/text v0.21.0 // indirect\n---\ntest/integration/go.sum\n@@ -1,7 +1,7 @@\n filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=\n filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5 h1:nnAKqkgp1eIdBzaMLCvA85Rn+g2ZolmsI1F9tGsQeYY=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5/go.mod h1:Bog3kcmtLKgDc4rVVjUDWIpVyUKyUxMAoEPYlph6ql8=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6 h1:ZuWhmUXY/co2jqEUYYosTlAruqzATzrYQ4IV5VKiKNM=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6/go.mod h1:UX+iYMTzZ7Ik6N5rD8U32x7QwKaGyG/aAflWWDaHMDc=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n@@ -155,8 +155,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M=\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 h1:146llE+6P/9YO8RcHRehzGNiS9+OoirKW9/aML6/JIA=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 h1:6zYoI+NGpRPo0UjbnJfmqqTFcTEKvbv77h0ZcgeLXJs=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n@@ -272,8 +272,8 @@ golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=\n golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=\n golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n@@ -285,8 +285,8 @@ golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=\n+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=\n golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.23.0\n toolchain go1.23.6\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n \tgithub.com/gruntwork-io/terratest v0.48.2\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n@@ -81,7 +81,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.7.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.22.0 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 // indirect\n \tgithub.com/jackc/pgpassfile v1.0.0 // indirect\n \tgithub.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect\n \tgithub.com/jackc/pgx/v5 v5.7.1 // indirect\n@@ -117,10 +117,10 @@ require (\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n \tgolang.org/x/crypto v0.32.0 // indirect\n-\tgolang.org/x/mod v0.22.0 // indirect\n+\tgolang.org/x/mod v0.23.0 // indirect\n \tgolang.org/x/net v0.34.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n-\tgolang.org/x/sync v0.10.0 // indirect\n+\tgolang.org/x/sync v0.11.0 // indirect\n \tgolang.org/x/sys v0.29.0 // indirect\n \tgolang.org/x/term v0.28.0 // indirect\n \tgolang.org/x/text v0.21.0 // indirect\n---\ntest/integration/go.sum\n@@ -1,7 +1,7 @@\n filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=\n filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5 h1:nnAKqkgp1eIdBzaMLCvA85Rn+g2ZolmsI1F9tGsQeYY=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5/go.mod h1:Bog3kcmtLKgDc4rVVjUDWIpVyUKyUxMAoEPYlph6ql8=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6 h1:ZuWhmUXY/co2jqEUYYosTlAruqzATzrYQ4IV5VKiKNM=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6/go.mod h1:UX+iYMTzZ7Ik6N5rD8U32x7QwKaGyG/aAflWWDaHMDc=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n@@ -155,8 +155,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M=\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 h1:146llE+6P/9YO8RcHRehzGNiS9+OoirKW9/aML6/JIA=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 h1:6zYoI+NGpRPo0UjbnJfmqqTFcTEKvbv77h0ZcgeLXJs=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n@@ -272,8 +272,8 @@ golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=\n golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=\n golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n@@ -285,8 +285,8 @@ golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=\n+golang.org/x/sync // h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=\n golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.23.0\n toolchain go1.23.6\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6\n \tgithub.com/gruntwork-io/terratest v0.48.2\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n@@ -81,7 +81,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.7.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.22.0 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 // indirect\n \tgithub.com/jackc/pgpassfile v1.0.0 // indirect\n \tgithub.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect\n \tgithub.com/jackc/pgx/v5 v5.7.1 // indirect\n@@ -117,10 +117,10 @@ require (\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n \tgolang.org/x/crypto v0.32.0 // indirect\n-\tgolang.org/x/mod v0.22.0 // indirect\n+\tgolang.org/x/mod v0.23.0 // indirect\n \tgolang.org/x/net v0.34.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n-\tgolang.org/x/sync v0.10.0 // indirect\n+\tgolang.org/x/sync v0.11.0 // indirect\n \tgolang.org/x/sys v0.29.0 // indirect\n \tgolang.org/x/term v0.28.0 // indirect\n \tgolang.org/x/text v0.21.0 // indirect\n---\ntest/integration/go.sum\n@@ -1,7 +1,7 @@\n filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=\n filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5 h1:nnAKqkgp1eIdBzaMLCvA85Rn+g2ZolmsI1F9tGsQeYY=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5/go.mod h1:Bog3kcmtLKgDc4rVVjUDWIpVyUKyUxMAoEPYlph6ql8=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6 h1:ZuWhmUXY/co2jqEUYYosTlAruqzATzrYQ4IV5VKiKNM=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.6/go.mod h1:UX+iYMTzZ7Ik6N5rD8U32x7QwKaGyG/aAflWWDaHMDc=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n@@ -155,8 +155,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M=\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 h1:146llE+6P/9YO8RcHRehzGNiS9+OoirKW9/aML6/JIA=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4 h1:6zYoI+NGpRPo0UjbnJfmqqTFcTEKvbv77h0ZcgeLXJs=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20250203082807-efaa306e97b4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n@@ -272,8 +272,8 @@ golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=\n golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=\n golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=\n+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n@@ -285,8 +285,8 @@ golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=\n+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=\n golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nMakefile\n@@ -15,7 Make @@\n # Please note that this file was generated from [terraform-google-module-template](https://github.com/terraform-google-modules/terraform-google-module-template).\n # Please make sure to contribute relevant changes upstream!\n \n-# Make will use bash instead of sh\n+# Make will use bash instead of sh1\n SHELL := /usr/bin/env bash\n \n DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23\n---\n\n\n---\n\nChoice B:\nMakefile\n@@ /usr/bin/env +15,7 @@\n # Please note that this file was generated from [terraform-google-module-template](https://github.com/terraform-google-modules/terraform-google-module-template).\n # Please make sure to contribute relevant changes upstream!\n \n-# Make will use bash instead of sh\n+# Make will use bash instead of sh1\n SHELL := /usr/bin/env bash\n \n DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23\n---\n\n\n---\n\nChoice C:\nMakefile\n@@ -15,7 +15,7 @@\n # Please # that this file was generated from [terraform-google-module-template](https://github.com/terraform-google-modules/terraform-google-module-template).\n # Please make sure to contribute relevant changes upstream!\n \n-# Make will use bash instead of sh\n+# Make will use bash instead of sh1\n SHELL := /usr/bin/env bash\n \n DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23\n---\n\n\n---\n\nChoice D:\nMakefile\n@@ -15,7 +15,7 @@\n # Please note that this file was generated from [terraform-google-module-template](https://github.com/terraform-google-modules/terraform-google-module-template).\n # Please make sure to contribute relevant changes upstream!\n \n-# Make will use bash instead of sh\n+# Make will use bash instead of sh1\n SHELL := /usr/bin/env bash\n \n DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nbuild/int.cloudbuild.yaml\n@@ -487,3 +487,5 @@ tags:\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n+options:\n+ machineType: \n\n---\n\nChoice B:\nbuild/int.cloudbuild.yaml\n@@ -487,3 +487,5 @@ tags:\n substitutions:\n tags:\n 'cft/developer-tools'\n _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n+options:\n+ machineType: 'E2_HIGHCPU_8'\n---\n\n\n---\n\nChoice C:\nbuild/int.cloudbuild.yaml\n@@ -487,3 +487,5 @@ tags:\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n+options:\n+ machineType: 'E2_HIGHCPU_8'\n---\n\n\n---\n\nChoice D:\nbuild/int.cloudbuild.yaml\n@@ -487,3 +487,5 @@ tags:\n substitutions:\n 'cft/developer-tools'\n _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n+options:\n+ machineType: 'E2_HIGHCPU_8'\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nWith [blueprint-test v0.17.5](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/releases/tag/infra%2Fblueprint-test%2Fv0.17.5) we can move to a smaller runner\n\n---\n\nChoice A:\nbuild/int.cloudbuild.yaml\n@@ -487,5 +487,3 @@ tags:\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n-options:\n- machineType: build/int.cloudbuild.yaml\n@@\n\n---\n\nChoice B:\n -487,5 +487,3 @@ tags:\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n-options:\n- machineType: 'E2_HIGHCPU_32'\n---\n\n\n---\n\nChoice C:\nbuild/int.cloudbuild.yaml\n@@ -487,5 +487,3 @@ tags:\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n-options:\n- '1.23'\n-options:\n- 'E2_HIGHCPU_32'\n---\n\n\n---\n\nChoice D:\nbuild/int.cloudbuild.yaml\n@@ -487,5 +487,3 @@ tags:\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n-options:\n- machineType: 'E2_HIGHCPU_32'\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nAdd support for [image_pull_secret](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/service_account#image_pull_secret-4) in Workload Identity module.\r\n\r\nK8s docs ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#add-imagepullsecrets-to-a-service-account\n\n---\n\nChoice A:\nmodules/workload-identity/README.md\n@@ -152,6 +152,7 @@ Error: Get \"http://localhost/api/v1/namespaces/default/serviceaccounts/your-serv\n | gcp\\_sa\\_description | The Service Google service account desciption; if null, will be left out | `string` | `null` | no |\n | gcp\\_sa\\_display\\_name | The Google service account display name; if null, a default string will be used | `string` | `null` | no |\n | gcp\\_sa\\_name | Name for the Google service account; overrides `var.name`. | `string` | `null` | no |\n+| image\\_pull\\_secrets | A list of references to secrets in the same namespace to use for pulling any images in pods that reference this Service Account | `list(string)` | `[]` | no |\n | impersonate\\_service\\_account | An optional service account to impersonate for gcloud commands. If this service account is not specified, the module will use Application Default Credentials. | `string` | `\"\"` | no |\n | k8s\\_sa\\_name | Name for the Kubernetes service account; overrides `var.name`. `cluster_name` and `location` must be set when this input is specified. | `string` | `null` | no |\n | k8s\\_sa\\_project\\_id | GCP project ID of the k8s service account; overrides `var.project_id`. `string` | `null` | no |\n---\nmodules/workload-identity/main.tf\n@@ -53,6 +53,15 @@ resource \"kubernetes_service_account\" \"main\" {\n count = var.use_existing_k8s_sa ? 0 : 1\n \n automount_service_account_token = var.automount_service_account_token\n+\n+ dynamic \"image_pull_secret\" {\n+ for_each = var.image_pull_secrets\n+\n+ content {\n+ name = image_pull_secret.value\n+ }\n+ }\n+\n metadata {\n name = local.k8s_given_name\n namespace = var.namespace\n---\nmodules/workload-identity/variables.tf\n@@ -84,6 +84,12 @@ variable \"automount_service_account_token\" {\n default = false\n }\n \n+variable \"image_pull_secrets\" {\n+ description = \"A list of references to secrets in the same namespace to use for pulling any images in pods that reference this Service Account\"\n+ type = list(string)\n+ default = []\n+}\n+\n variable \"roles\" {\n description = \"A list of roles to be added to the created service account\"\n type = list(string)\n---\n\n\n---\n\nChoice B:\nmodules/workload-identity/README.md\n@@ -152,6 +152,7 @@ Error: Get \"http://localhost/api/v1/namespaces/default/serviceaccounts/your-serv\n | gcp\\_sa\\_description | The Service Google service account desciption; if null, will be left out | `string` | `null` | no |\n | gcp\\_sa\\_display\\_name | The Google service account display name; if null, a default string will be used | `string` | `null` | no |\n | gcp\\_sa\\_name | Name for the Google service account; overrides `var.name`. | `string` | `null` | no |\n+| image\\_pull\\_secrets | A list of references to secrets in the same namespace to use for pulling any images in pods that reference this Service Account | `list(string)` | `[]` | no |\n | impersonate\\_service\\_account | An optional service account to impersonate for gcloud commands. If this service account is not specified, the module will use Application Default Credentials. | `string` | `\"\"` | no |\n | k8s\\_sa\\_name | Name for the Kubernetes service account; overrides `var.name`. `cluster_name` and `location` must be set when this input is specified. | `string` | `null` | no |\n | k8s\\_sa\\_project\\_id | GCP project ID of the k8s service account; overrides `var.project_id`. | `string` | `null` | no |\n---\nmodules/workload-identity/main.tf\n@@ -53,6 +53,15 @@ resource \"kubernetes_service_account\" \"main\" {\n count = var.use_existing_k8s_sa ? 0 : 1\n \n automount_service_account_token = var.automount_service_account_token\n+\n+ dynamic \"image_pull_secret\" {\n+ for_each = var.image_pull_secrets\n+\n+ content {\n+ name = image_pull_secret.value\n+ }\n+ }\n+\n metadata {\n name = local.k8s_given_name\n namespace = var.namespace\n---\nmodules/workload-identity/variables.tf\n@@ -84,6 +84,12 @@ variable \"automount_service_account_token\" {\n default = false\n }\n \n+variable \"image_pull_secrets\" {\n+ description = \"A list of references to secrets in the same namespace to use for pulling any images in pods that reference this Service Account\"\n+ type = list(string)\n+ default = []\n+}\n+\n variable \"roles\" {\n description = \"A list of roles to be added to the created service account\"\n type = list(string)\n---\n\n\n---\n\nChoice C:\nmodules/workload-identity/README.md\n@@ -152,6 +152,7 @@ Error: Get \"http://localhost/api/v1/namespaces/default/serviceaccounts/your-serv\n | gcp\\_sa\\_description | The Service Google service account desciption; if null, will be left out | `string` | `null` | no |\n | gcp\\_sa\\_display\\_name | The Google service account display name; if null, a default string will be used | `string` | `null` | no |\n | gcp\\_sa\\_name | Name for the Google service account; overrides `var.name`. | `string` | `null` | no |\n+| image\\_pull\\_secrets | A list of references to secrets in the same namespace to use for pulling any images in pods that reference this Service Account | `list(string)` | `[]` | no |\n | impersonate\\_service\\_account | optional service account to impersonate for gcloud commands. If this service account is not specified, the module will use Application Default Credentials. | `string` | `\"\"` | no |\n | k8s\\_sa\\_name | Name for the Kubernetes service account; overrides `var.name`. `cluster_name` and `location` must be set when this input is specified. | `string` | `null` | no |\n | k8s\\_sa\\_project\\_id | GCP project ID of the k8s service account; overrides `var.project_id`. | `string` | `null` | no |\n---\nmodules/workload-identity/main.tf\n@@ -53,6 +53,15 @@ resource \"kubernetes_service_account\" \"main\" {\n count = var.use_existing_k8s_sa ? 0 : 1\n \n automount_service_account_token = var.automount_service_account_token\n+\n+ dynamic \"image_pull_secret\" {\n+ for_each = var.image_pull_secrets\n+\n+ content {\n+ name = image_pull_secret.value\n+ }\n+ }\n+\n metadata {\n name = local.k8s_given_name\n namespace = var.namespace\n---\nmodules/workload-identity/variables.tf\n@@ -84,6 +84,12 @@ variable \"automount_service_account_token\" {\n default = false\n }\n \n+variable \"image_pull_secrets\" {\n+ description = \"A list of references to secrets in the same namespace to use for pulling any images in pods that reference this Service Account\"\n+ type = list(string)\n+ default = []\n+}\n+\n variable \"roles\" {\n description = \"A list of roles to be added to the created service account\"\n type = list(string)\n---\n\n\n---\n\nChoice D:\nmodules/workload-identity/README.md\n@@ -152,6 +152,7 @@ Error: Get \"http://localhost/api/v1/namespaces/default/serviceaccounts/your-serv\n | gcp\\_sa\\_description | The Service Google service account desciption; if null, will be left out | `string` | `null` | no |\n | gcp\\_sa\\_display\\_name | The Google service account display name; if null, a default string will be used | `string` | `null` | no |\n | gcp\\_sa\\_name | Name for the Google service account; overrides `var.name`. | `string` | `null` | no |\n+| image\\_pull\\_secrets | A list of references to secrets in the same namespace to use for pulling any images in pods that reference this Service Account | `list(string)` | `[]` | no |\n | impersonate\\_service\\_account | An optional service account to impersonate for gcloud commands. If this service account is not specified, the module will use Application Default Credentials. | `string` | `\"\"` | no |\n | k8s\\_sa\\_name | Name for the Kubernetes service account; overrides `var.name`. `cluster_name` and `location` must be set when this input is specified. | `string` | `null` | no |\n | k8s\\_sa\\_project\\_id | GCP project ID of the k8s service account; overrides `var.project_id`. | `string` | `null` | no |\n---\nmodules/workload-identity/main.tf\n@@ -53,6 +53,15 @@ resource \"kubernetes_service_account\" \"main\" {\n count = var.use_existing_k8s_sa ? 0 : 1\n \n automount_service_account_token = var.automount_service_account_token\n+\n+ dynamic \"image_pull_secret\" {\n+ for_each = var.image_pull_secrets\n+\n+ content {\n+ name = image_pull_secret.value\n+ }\n+ }\n+\n metadata {\n name = local.k8s_given_name\n namespace = var.namespace\n---\nmodules/workload-identity/variables.tf\n@@ -84,6 +84,12 @@ variable \"automount_service_account_token\" {\n default = false\n }\n \n+variable \"image_pull_secrets\" {\n+ description = \"A list of references to secrets in the same namespace to use for pulling any images in pods that reference this Service Account\"\n+ type = list(string)\n+ default = []\n+}\n+\n variable \"roles\" {\n description = \"A list of roles to be added to the created service account\"\n type = list(string)\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| nginx | kubernetes_pod | patch | `1.27.3` -> `1.27.4` |\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNjcuMSIsInVwZGF0ZWRJblZlciI6IjM5LjE2Ny4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.4\"\n image = \"nginx:1.27.4\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice B:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.3\"\n+ image = \"nginx:1.27.4\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice C:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image \"nginx:1.27.3\"\n+ image = \"nginx:1.27.4\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice D:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource {\n \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.3\"\n+ image = \"nginx:1.27.4\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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/kms/google](https://registry.terraform.io/modules/terraform-google-modules/kms/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-kms)) | module | major | `~> 3.2` -> `~> 4.0` |\n| [terraform-google-modules/kms/google](https://registry.terraform.io/modules/terraform-google-modules/kms/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-kms)) | module | major | `~> 3.0` -> `~> 4.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-kms (terraform-google-modules/kms/google)</summary>\n\n### [`v4.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-kms/blob/HEAD/CHANGELOG.md#400-2025-02-05)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-kms/compare/v3.2.0...v4.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TF>=1.3:** Update go modules and dev-tools ([#​161](https://redirect.github.com/terraform-google-modules/terraform-google-kms/issues/161))\n- Restricting autokey module to autokey configuration use case ([#​163](https://redirect.github.com/terraform-google-modules/terraform-google-kms/issues/163))\n\n##### Features\n\n- Restricting autokey module to autokey configuration use case ([#​163](https://redirect.github.com/terraform-google-modules/terraform-google-kms/issues/163)) ([28f3072](https://redirect.github.com/terraform-google-modules/terraform-google-kms/commit/28f307203389a839995af8e420b2858a4538c9bb))\n\n##### Bug Fixes\n\n- **TF>=1.3:** Update go modules and dev-tools ([#​161](https://redirect.github.com/terraform-google-modules/terraform-google-kms/issues/161)) ([1f29092](https://redirect.github.com/terraform-google-modules/terraform-google-kms/commit/1f2909209cd1c1e54031757570dd073d9a1b98de))\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 these updates 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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNjcuMSIsInVwZGF0ZWRJblZlciI6IjM5LjE2Ny4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nexamples/confidential_safer_cluster/kms.tf\n@@ -20,7 +20,7 @@ locals {\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 3.0\"\n+ version = \"~> 4.0\"\n project_id = var.project_id\n location = var.region\n keyring = \"gke-keyring-${random_string.suffix.result}\"\n---\nexamples/safer_cluster_iap_bastion/kms.tf\n@@ -16,7 +16,7 @@\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 3.0\"\n+ version = \"~> 4.0\"\n project_id = var.project_id\n location = var.region\n keyring = \"gke-keyring\"\n---\nexamples/simple_autopilot_private_cmek/main.tf\n@@ -32,7 +32,7 @@ data \"google_project\" \"main\" {\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 3.2\"\n+ version = \"~> 4.0\"\n \n project_id = var.project_id\n key_protection_level = \"HSM\"\n---\n\n\n---\n\nChoice B:\nexamples/confidential_safer_cluster/kms.tf\n@@ -20,7 +20,7 @@ locals {\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 3.0\"\n+ version = \"~> 4.0\"\n project_id = var.project_id\n location = var.region\n keyring = \"gke-keyring-${random_string.suffix.result}\"\n---\nexamples/safer_cluster_iap_bastion/kms.tf\n@@ -16,7 +16,7 @@\n \n module \"kms\" keyring source = \"terraform-google-modules/kms/google\"\n- version = \"~> 3.0\"\n+ version = \"~> 4.0\"\n project_id = var.project_id\n location = var.region\n keyring = \"gke-keyring\"\n---\nexamples/simple_autopilot_private_cmek/main.tf\n@@ -32,7 +32,7 @@ data \"google_project\" \"main\" {\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 3.2\"\n+ version = \"~> 4.0\"\n \n project_id = var.project_id\n key_protection_level = \"HSM\"\n---\n\n\n---\n\nChoice C:\nexamples/confidential_safer_cluster/kms.tf\n@@ -20,7 +20,7 @@ locals {\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 3.0\"\n+ version = \"~> 4.0\"\n project_id = var.project_id\n location = var.region\n keyring = \"gke-keyring-${random_string.suffix.result}\"\n---\nexamples/safer_cluster_iap_bastion/kms.tf\n@@ -16,7 +16,7 @@\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 3.0\"\n+ version = \"~> 4.0\"\n project_id = var.project_id\n location = var.region\n keyring = = \"gke-keyring\"\n---\nexamples/simple_autopilot_private_cmek/main.tf\n@@ -32,7 +32,7 @@ data \"google_project\" \"main\" {\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 3.2\"\n+ version = \"~> 4.0\"\n \n project_id = var.project_id\n key_protection_level = \"HSM\"\n---\n\n\n---\n\nChoice D:\nexamples/confidential_safer_cluster/kms.tf\n@@ -20,7 +20,7 @@ locals {\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 3.0\"\n+ version = \"~> 4.0\"\n project_id = var.project_id\n location = var.region\n keyring = \"gke-keyring-${random_string.suffix.result}\"\n---\nexamples/safer_cluster_iap_bastion/kms.tf\n@@ -16,7 +16,7 @@\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 3.0\"\n+ version = \"~> 4.0\"\n project_id = var.project_id\n location = var.region\n keyring = \"gke-keyring\"\n---\nexamples/simple_autopilot_private_cmek/main.tf\n@@ -32,7 +32,7 @@ data \"google_project\" \"main\" {\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 3.2\"\n+ version = \"~> 4.0\"\n \n project_id = var.project_id\n key_protection_level = \"HSM\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -236,6 +236,9 @@\n \"oauthScopes\": [\n \"https://www.googleapis.com/auth/cloud-platform\"\n ],\n+ \"resourceLabels\": {\n+ \"goog-gke-node-pool-provisioning-model\": \"on-demand\"\n+ },\n \"serviceAccount\": \"SERVICE_ACCOUNT\",\n \"shieldedInstanceConfig\": {\n \"enableIntegrityMonitoring\": true\n---\n\n\n---\n\nChoice B:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -236,6 +236,9 @@\n \"oauthScopes\": [\n \"https://www.googleapis.com/auth/cloud-platform\"\n ],\n+ \"resourceLabels\": {\n+ \"goog-gke-node-pool-provisioning-model\": \"on-demand\"\n+ },\n \"serviceAccount\": \"SERVICE_ACCOUNT\",\n \"shieldedInstanceConfig\": {\n \"enableIntegrityMonitoring\": true\n---\n\n\n---\n\nChoice C:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -236,6 +236,9 @@\n \"oauthScopes\": [\n \"https://www.googleapis.com/auth/cloud-platform\"\n ],\n+ \"resourceLabels\": {\n+ \"goog-gke-node-pool-provisioning-model\": \"on-demand\"\n+ },\n \"serviceAccount\": \"SERVICE_ACCOUNT\",\n \"shieldedInstanceConfig\": {\n {\n+ \"enableIntegrityMonitoring\": true\n---\n\n\n---\n\nChoice D:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -236,6 +236,9 @@\n \"oauthScopes\": [\n \"https://www.googleapis.com/auth/cloud-platform\"\n ],\n+ \"resourceLabels\": {\n+ \"goog-gke-node-pool-provisioning-model\": \"on-demand\"\n+ },\n \"serviceAccount\": \"SERVICE_ACCOUNT\",\n \"shieldedInstanceConfig\": {\n \"enableIntegrityMonitoring\": true\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence | Type | Update |\n|---|---|---|---|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://redirect.github.com/gruntwork-io/terratest) | `v0.48.1` -> `v0.48.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | require | patch |\n| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | `1.23.5` -> `1.23.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | toolchain | patch |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.48.2`](https://redirect.github.com/gruntwork-io/terratest/releases/tag/v0.48.2)\n\n[Compare Source](https://redirect.github.com/gruntwork-io/terratest/compare/v0.48.1...v0.48.2)\n\n#### Modules affected\n\n- `shell`\n- `aws`\n- `gcp`\n- `terraform`\n- `k8s`\n- `azure`\n- `database`\n\n#### What's Changed\n\n- **feat:** Add `RunCommandAndGetStdOutErr` by [@​james03160927](https://redirect.github.com/gruntwork-io/terratest/pull/1482)\n- **feat:** Implement functionality for `S3BucketServerSideEncryption` by [@​james03160927](https://redirect.github.com/gruntwork-io/terratest/pull/1494)\n- **feat:** Add an import SSH key for a specific project by [@​james03160927](https://redirect.github.com/gruntwork-io/terratest/pull/1487)\n- **feat:** Do not merge `stderr` into `stdout` by [@​g7r](https://redirect.github.com/gruntwork-io/terratest/pull/1495)\n- **feat:** Add bucket ownership control by [@​james03160927](https://redirect.github.com/gruntwork-io/terratest/pull/1496)\n- **feat:** Add `request-timeout` options for `kubectl` by [@​james03160927](https://redirect.github.com/gruntwork-io/terratest/pull/1497)\n- **feat:** Support pagination for `GetAllParametersOfRdsInstance` by [@​james03160927](https://redirect.github.com/gruntwork-io/terratest/pull/1498)\n- **feat:** Add support for Azure container apps by [@​tjololo](https://redirect.github.com/gruntwork-io/terratest/pull/1493)\n- **chore(deps):** Bump `golang.org/x/crypto` from 0.29.0 to 0.31.0 by [@​dependabot](https://redirect.github.com/gruntwork-io/terratest/pull/1499)\n- **feat:** Add support for databases by [@​james03160927](https://redirect.github.com/gruntwork-io/terratest/pull/1502)\n- **chore(deps):** Bump `golang.org/x/net` from 0.31.0 to 0.33.0 by [@​dependabot](https://redirect.github.com/gruntwork-io/terratest/pull/1503)\n- **feat:** Add a new check for private DNS zones by [@​johannes-engler-mw](https://redirect.github.com/gruntwork-io/terratest/pull/1455)\n- **chore:** Update copyright year in README by [@​ofek](https://redirect.github.com/gruntwork-io/terratest/pull/1506)\n- **fix:** Use `HasSuffix` to check for suffixes by [@​amangale](https://redirect.github.com/gruntwork-io/terratest/pull/1505)\n\n#### New Contributors\n\n- [@​g7r](https://redirect.github.com/g7r) made their first contribution in [https://github.com/gruntwork-io/terratest/pull/1495](https://redirect.github.com/gruntwork-io/terratest/pull/1495)\n- [@​tjololo](https://redirect.github.com/tjololo) made their first contribution in [https://github.com/gruntwork-io/terratest/pull/1493](https://redirect.github.com/gruntwork-io/terratest/pull/1493)\n- [@​johannes-engler-mw](https://redirect.github.com/johannes-engler-mw) made their first contribution in [https://github.com/gruntwork-io/terratest/pull/1455](https://redirect.github.com/gruntwork-io/terratest/pull/1455)\n- [@​ofek](https://redirect.github.com/ofek) made their first contribution in [https://github.com/gruntwork-io/terratest/pull/1506](https://redirect.github.com/gruntwork-io/terratest/pull/1506)\n- [@​amangale](https://redirect.github.com/amangale) made their first contribution in [https://github.com/gruntwork-io/terratest/pull/1505](https://redirect.github.com/gruntwork-io/terratest/pull/1505)\n\n**Full Changelog**: https://github.com/gruntwork-io/terratest/compare/v0.48.1...v0.48.2\n\n</details>\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.23.6`](https://redirect.github.com/golang/go/compare/go1.23.5...go1.23.6)\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👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired.\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNjQuMSIsInVwZGF0ZWRJblZlciI6IjM5LjE2NC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -2,11 +2,11 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.5\n+toolchain go1.23.6\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5\n-\tgithub.com/gruntwork-io/terratest v0.48.1\n+\tgithub.com/gruntwork-io/terratest v0.48.2\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n@@ -116,13 +116,13 @@ require (\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.31.0 // indirect\n+\tgolang.org/x/crypto v0.32.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n-\tgolang.org/x/net v0.33.0 // indirect\n+\tgolang.org/x/net v0.34.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.10.0 // indirect\n-\tgolang.org/x/sys v0.28.0 // indirect\n-\tgolang.org/x/term v0.27.0 // indirect\n+\tgolang.org/x/sys v0.29.0 // indirect\n+\tgolang.org/x/term v0.28.0 // indirect\n \tgolang.org/x/text v0.21.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n---\ntest/integration/go.sum\n@@ -136,8 +136,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm\n github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.48.1 h1:pnydDjkWbZCUYXvQkr24y21fBo8PfJC5hRGdwbl1eXM=\n-github.com/gruntwork-io/terratest v0.48.1/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=\n+github.com/gruntwork-io/terratest v0.48.2 h1:+VwfODchq8jxZZWD+s8gBlhD1z6/C4bFLNrhpm9ONrs=\n+github.com/gruntwork-io/terratest v0.48.2/go.mod h1:Y5ETyD4ZQ2MZhasPno272fWuCpKwvTPYDi8Y0tIMqTE=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n@@ -268,8 +268,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.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.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=\n+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=\n golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n@@ -278,8 +278,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=\n-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=\n+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=\n+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=\n golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n@@ -291,10 +291,10 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.16.0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n-golang.org/x/crypto v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=\n-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\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/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=\n+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=\n+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -2,11 +2,11 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.5\n+toolchain go1.23.6\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5\n-\tgithub.com/gruntwork-io/terratest v0.48.1\n+\tgithub.com/gruntwork-io/terratest v0.48.2\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n@@ -116,13 +116,13 @@ require (\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.31.0 // indirect\n+\tgolang.org/x/crypto v0.32.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n-\tgolang.org/x/net v0.33.0 // indirect\n+\tgolang.org/x/net v0.34.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.10.0 // indirect\n-\tgolang.org/x/sys v0.28.0 // indirect\n-\tgolang.org/x/term v0.27.0 // indirect\n+\tgolang.org/x/sys v0.29.0 // indirect\n+\tgolang.org/x/term v0.28.0 // indirect\n \tgolang.org/x/text v0.21.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n---\ntest/integration/go.sum\n@@ -136,8 +136,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm\n github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons golang.org/x/net h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.48.1 h1:pnydDjkWbZCUYXvQkr24y21fBo8PfJC5hRGdwbl1eXM=\n-github.com/gruntwork-io/terratest v0.48.1/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=\n+github.com/gruntwork-io/terratest v0.48.2 h1:+VwfODchq8jxZZWD+s8gBlhD1z6/C4bFLNrhpm9ONrs=\n+github.com/gruntwork-io/terratest v0.48.2/go.mod h1:Y5ETyD4ZQ2MZhasPno272fWuCpKwvTPYDi8Y0tIMqTE=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n@@ -268,8 +268,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.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.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=\n+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=\n golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n@@ -278,8 +278,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=\n-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=\n+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=\n+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=\n golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n@@ -291,10 +291,10 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\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/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=\n-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=\n+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=\n+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=\n+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -2,11 +2,11 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.5\n+toolchain go1.23.6\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5\n-\tgithub.com/gruntwork-io/terratest v0.48.1\n+\tgithub.com/gruntwork-io/terratest v0.48.2\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n@@ -116,13 +116,13 @@ require (\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.31.0 // indirect\n+\tgolang.org/x/crypto v0.32.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n-\tgolang.org/x/net v0.33.0 // indirect\n+\tgolang.org/x/net v0.34.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.10.0 // indirect\n-\tgolang.org/x/sys v0.28.0 // indirect\n-\tgolang.org/x/term v0.27.0 // indirect\n+\tgolang.org/x/sys v0.29.0 // indirect\n+\tgolang.org/x/term v0.28.0 // indirect\n \tgolang.org/x/text v0.21.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n---\ntest/integration/go.sum\n@@ -136,8 +136,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm\n github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.48.1 h1:pnydDjkWbZCUYXvQkr24y21fBo8PfJC5hRGdwbl1eXM=\n-github.com/gruntwork-io/terratest v0.48.1/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=\n+github.com/gruntwork-io/terratest v0.48.2 h1:+VwfODchq8jxZZWD+s8gBlhD1z6/C4bFLNrhpm9ONrs=\n+github.com/gruntwork-io/terratest v0.48.2/go.mod h1:Y5ETyD4ZQ2MZhasPno272fWuCpKwvTPYDi8Y0tIMqTE=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n@@ -268,8 +268,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.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.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=\n+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=\n golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n@@ -278,8 +278,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=\n-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=\n+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=\n+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=\n golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n@@ -291,10 +291,10 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\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/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=\n-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=\n+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=\n+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=\n+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -2,11 +2,11 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.23.0\n \n-toolchain go1.23.5\n+toolchain go1.23.6\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5\n-\tgithub.com/gruntwork-io/terratest v0.48.1\n+\tgithub.com/gruntwork-io/terratest v0.48.2\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n@@ -116,13 +116,13 @@ require (\n \tgithub.com/x448/float16 v0.8.4 // indirect\n \tgithub.com/xrash/smetrics h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=\n // indirect\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n-\tgolang.org/x/crypto v0.31.0 // indirect\n+\tgolang.org/x/crypto v0.32.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n-\tgolang.org/x/net v0.33.0 // indirect\n+\tgolang.org/x/net v0.34.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sync v0.10.0 // indirect\n-\tgolang.org/x/sys v0.28.0 // indirect\n-\tgolang.org/x/term v0.27.0 // indirect\n+\tgolang.org/x/sys v0.29.0 // indirect\n+\tgolang.org/x/term v0.28.0 // indirect\n \tgolang.org/x/text v0.21.0 // indirect\n \tgolang.org/x/time v0.8.0 // indirect\n \tgolang.org/x/tools v0.26.0 // indirect\n---\ntest/integration/go.sum\n@@ -136,8 +136,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm\n github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.48.1 h1:pnydDjkWbZCUYXvQkr24y21fBo8PfJC5hRGdwbl1eXM=\n-github.com/gruntwork-io/terratest v0.48.1/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=\n+github.com/gruntwork-io/terratest v0.48.2 h1:+VwfODchq8jxZZWD+s8gBlhD1z6/C4bFLNrhpm9ONrs=\n+github.com/gruntwork-io/terratest v0.48.2/go.mod h1:Y5ETyD4ZQ2MZhasPno272fWuCpKwvTPYDi8Y0tIMqTE=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n@@ -268,8 +268,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmB\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\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.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.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=\n+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=\n golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n@@ -278,8 +278,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=\n-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=\n+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=\n+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=\n golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n@@ -291,10 +291,10 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h\n golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\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/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=\n-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=\n+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=\n+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=\n+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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## [36.0.2](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.1...v36.0.2) (2025-02-11)\n\n\n### Bug Fixes\n\n* **deps:** Update Terraform terraform-google-modules/kubernetes-engine/google to v36 ([#2269](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2269)) ([c3e1a8d](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/c3e1a8dd81333116261c231cf531bb7b343ef809))\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@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0\n \n Extending the adopted spec, each change should have a link to its corresponding pull request appended.\n \n+## [36.0.2](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.1...v36.0.2) (2025-02-11)\n+\n+\n+### Bug Fixes\n+\n+* **deps:** Update Terraform terraform-google-modules/kubernetes-engine/google to v36 ([#2269](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2269)) ([c3e1a8d](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/c3e1a8dd81333116261c231cf531bb7b343ef809))\n+\n ## [36.0.1](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.0...v36.0.1) (2025-02-06)\n \n \n---\nautogen/main/versions.tf.tmpl\n@@ -63,6 +63,6 @@ terraform {\n }\n }\n provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.2\"\n }\n }\n---\nautogen/safer-cluster/versions.tf.tmpl\n@@ -23,6 +23,6 @@ terraform {\n required_version = \">=1.3\"\n \n \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.2\"\n }\n }\n---\nmodules/auth/versions.tf\n@@ -26,6 +26,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.2\"\n }\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.2\"\n }\n }\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.2\"\n }\n }\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/beta-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.2\"\n }\n }\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/beta-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.2\"\n }\n }\n---\nmodules/binary-authorization/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.2\"\n }\n }\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -33,7 +33,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.2\"\n }\n }\n \n---\nmodules/fleet-membership/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.2\"\n }\n }\n---\nmodules/hub-legacy/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.2\"\n }\n }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/private-cluster/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.2\"\n }\n }\n---\nmodules/safer-cluster-update-variant/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/safer-cluster/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.2\"\n }\n }\n---\nmodules/services/versions.tf\n@@ -19,6 +19,6 @@ terraform {\n required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.2\"\n }\n }\n---\nmodules/workload-identity/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.2\"\n }\n }\n---\nversions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.2\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0\n \n Extending the adopted spec, each change should have a link to its corresponding pull request appended.\n \n+## [36.0.2](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.1...v36.0.2) (2025-02-11)\n+\n+\n+### Bug Fixes\n+\n+* **deps:** Update Terraform terraform-google-modules/kubernetes-engine/google to v36 ([#2269](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2269)) ([c3e1a8d](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/c3e1a8dd81333116261c231cf531bb7b343ef809))\n+\n ## [36.0.1](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.0...v36.0.1) (2025-02-06)\n \n \n---\nautogen/main/versions.tf.tmpl\n@@ beta_cluster +63,6 @@ terraform {\n }\n }\n provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.2\"\n }\n }\n---\nautogen/safer-cluster/versions.tf.tmpl\n@@ -23,6 +23,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.2\"\n }\n }\n---\nmodules/auth/versions.tf\n@@ -26,6 +26,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.2\"\n }\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.2\"\n }\n }\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.2\"\n }\n }\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/beta-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.2\"\n }\n }\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/beta-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.2\"\n }\n }\n---\nmodules/binary-authorization/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.2\"\n }\n }\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -33,7 +33,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.2\"\n }\n }\n \n---\nmodules/fleet-membership/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.2\"\n }\n }\n---\nmodules/hub-legacy/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.2\"\n }\n }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/private-cluster/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.2\"\n }\n }\n---\nmodules/safer-cluster-update-variant/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/safer-cluster/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.2\"\n }\n }\n---\nmodules/services/versions.tf\n@@ -19,6 +19,6 @@ terraform {\n required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.2\"\n }\n }\n---\nmodules/workload-identity/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.2\"\n }\n }\n---\nversions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.2\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0\n \n Extending the adopted spec, each change should have a link to its corresponding pull request appended.\n \n+## [36.0.2](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.1...v36.0.2) (2025-02-11)\n+\n+\n+### Bug Fixes\n+\n+* **deps:** Update Terraform terraform-google-modules/kubernetes-engine/google to v36 ([#2269](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2269)) ([c3e1a8d](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/c3e1a8dd81333116261c231cf531bb7b343ef809))\n+\n ## [36.0.1](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.0...v36.0.1) (2025-02-06)\n \n \n---\nautogen/main/versions.tf.tmpl\n@@ -63,6 +63,6 @@ terraform {\n }\n }\n provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.2\"\n }\n }\n---\nautogen/safer-cluster/versions.tf.tmpl\n@@ -23,6 +23,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.2\"\n }\n }\n---\nmodules/auth/versions.tf\n@@ -26,6 +26,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.2\"\n }\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.2\"\n }\n }\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.2\"\n }\n }\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/beta-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.2\"\n }\n }\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/beta-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.2\"\n }\n }\n---\nmodules/binary-authorization/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.2\"\n }\n }\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -33,7 +33,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.2\"\n }\n }\n \n---\nmodules/fleet-membership/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.2\"\n }\n }\n---\nmodules/hub-legacy/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.2\"\n }\n }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/private-cluster/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.2\"\n }\n }\n---\nmodules/safer-cluster-update-variant/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/safer-cluster/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.2\"\n }\n }\n---\nmodules/services/versions.tf\n@@ -19,6 +19,6 @@ terraform {\n required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.2\"\n }\n }\n---\nmodules/workload-identity/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.2\"\n }\n }\n---\nversions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.2\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0\n \n Extending the adopted spec, each change should have a link to its corresponding pull request appended.\n \n+## [36.0.2](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.1...v36.0.2) (2025-02-11)\n+\n+\n+### Bug Fixes\n+\n+* **deps:** Update Terraform terraform-google-modules/kubernetes-engine/google to v36 ([#2269](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2269)) ([c3e1a8d](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/c3e1a8dd81333116261c231cf531bb7b343ef809))\n+\n ## [36.0.1](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.0...v36.0.1) (2025-02-06)\n \n \n---\nautogen/main/versions.tf.tmpl\n@@ -63,6 +63,6 @@ terraform {\n }\n }\n provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.2\"\n }\n }\n---\nautogen/safer-cluster/versions.tf.tmpl\n@@ -23,6 +23,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.2\"\n }\n }\n---\nmodules/auth/versions.tf\n@@ -26,6 +26,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.2\"\n }\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.2\"\n }\n }\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.2\"\n }\n }\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/beta-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.2\"\n }\n }\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/beta-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.2\"\n }\n }\n---\nmodules/binary-authorization/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.2\"\n }\n }\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -33,7 +33,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.2\"\n }\n }\n \n---\nmodules/fleet-membership/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.2\"\n }\n }\n---\nmodules/hub-legacy/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.2\"\n }\n }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/private-cluster/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.2\"\n }\n }\n---\nmodules/safer-cluster-update-variant/versions.tf\n@@ CHANGELOG.md\n@@ +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.2\"\n }\n }\n---\nmodules/safer-cluster/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.2\"\n }\n }\n---\nmodules/services/versions.tf\n@@ -19,6 +19,6 @@ terraform {\n required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.2\"\n }\n }\n---\nmodules/workload-identity/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.2\"\n }\n }\n---\nversions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.2\"\n }\n }\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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## [36.0.1](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.0...v36.0.1) (2025-02-06)\n\n\n### Bug Fixes\n\n* grant_registry_access gate serviceUsageConsumer ([#2266](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2266)) ([69eca65](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/69eca655edcf5dbd49d5b724ed284ef63bcf6f8c))\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@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0\n \n Extending the adopted spec, each change should have a link to its corresponding pull request appended.\n \n+## [36.0.1](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.0...v36.0.1) (2025-02-06)\n+\n+\n+### Bug Fixes\n+\n+* grant_registry_access gate serviceUsageConsumer ([#2266](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2266)) ([69eca65](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/69eca655edcf5dbd49d5b724ed284ef63bcf6f8c))\n+\n ## [36.0.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v35.0.1...v36.0.0) (2025-02-03)\n \n \n---\nautogen/main/versions.tf.tmpl\n@@ -63,6 +63,6 @@ terraform {\n }\n }\n provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n }\n }\n---\nautogen/safer-cluster/versions.tf.tmpl\n@@ -23,6 +23,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n }\n }\n---\nmodules/auth/versions.tf\n@@ -26,6 +26,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.1\"\n }\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.1\"\n }\n }\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.1\"\n }\n }\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/beta-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.1\"\n }\n }\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/beta-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.1\"\n }\n }\n---\nmodules/binary-authorization/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.1\"\n }\n }\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -33,7 +33,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.1\"\n }\n }\n \n---\nmodules/fleet-membership/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n }\n }\n---\nmodules/hub-legacy/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n }\n }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/private-cluster/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.1\"\n }\n }\n---\nmodules/safer-cluster-update-variant/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/safer-cluster/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.1\"\n }\n }\n---\nmodules/services/versions.tf\n@@ -19,6 +19,6 @@ {\n required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.1\"\n }\n }\n---\nmodules/workload-identity/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.1\"\n }\n }\n---\nversions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.1\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0\n \n Extending the adopted spec, each change should have a link to its corresponding pull request appended.\n \n+## [36.0.1](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.0...v36.0.1) (2025-02-06)\n+\n+\n+### Bug Fixes\n+\n+* grant_registry_access gate serviceUsageConsumer ([#2266](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2266)) ([69eca65](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/69eca655edcf5dbd49d5b724ed284ef63bcf6f8c))\n+\n ## [36.0.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v35.0.1...v36.0.0) (2025-02-03)\n \n \n---\nautogen/main/versions.tf.tmpl\n@@ -63,6 +63,6 @@ terraform {\n }\n }\n provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n }\n }\n---\nautogen/safer-cluster/versions.tf.tmpl\n@@ -23,6 +23,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n }\n }\n---\nmodules/auth/versions.tf\n@@ -26,6 +26,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.1\"\n }\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.1\"\n }\n }\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.1\"\n }\n }\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/beta-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.1\"\n }\n }\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/beta-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.1\"\n }\n }\n---\nmodules/binary-authorization/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.1\"\n }\n }\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -33,7 +33,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.1\"\n }\n }\n \n---\nmodules/fleet-membership/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n }\n }\n---\nmodules/hub-legacy/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n }\n }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/private-cluster/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.1\"\n }\n }\n---\nmodules/safer-cluster-update-variant/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/safer-cluster/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.1\"\n }\n }\n---\nmodules/services/versions.tf\n@@ -19,6 +19,6 @@ terraform {\n required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.1\"\n }\n }\n---\nmodules/workload-identity/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.1\"\n }\n }\n---\nversions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.1\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0\n \n Extending the adopted spec, each change should have a link to its corresponding pull request appended.\n \n+## [36.0.1](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.0...v36.0.1) (2025-02-06)\n+\n+\n+### Bug Fixes\n+\n+* grant_registry_access gate serviceUsageConsumer ([#2266](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2266)) ([69eca65](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/69eca655edcf5dbd49d5b724ed284ef63bcf6f8c))\n+\n ## [36.0.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v35.0.1...v36.0.0) (2025-02-03)\n \n \n---\nautogen/main/versions.tf.tmpl\n@@ -63,6 +63,6 @@ terraform {\n }\n }\n provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n }\n }\n---\nautogen/safer-cluster/versions.tf.tmpl\n@@ -23,6 +23,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n }\n }\n---\nmodules/auth/versions.tf\n@@ -26,6 +26,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.1\"\n }\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.1\"\n }\n }\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.1\"\n }\n }\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/beta-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.1\"\n }\n }\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/beta-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.1\"\n }\n }\n---\nmodules/binary-authorization/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.1\"\n }\n }\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -33,7 +33,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.1\"\n }\n }\n \n---\nmodules/fleet-membership/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n }\n }\n---\nmodules/hub-legacy/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n }\n }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/private-cluster/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.1\"\n }\n }\n---\nmodules/safer-cluster-update-variant/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/safer-cluster/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.1\"\n }\n }\n---\nmodules/services/versions.tf\n@@ -19,6 +19,6 @@ terraform {\n required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.1\"\n }\n }\n---\nmodules/workload-identity/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.1\"\n }\n }\n---\nversions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.1\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0\n \n Extending the adopted spec, each change should have a link to its corresponding pull request appended.\n \n+## [36.0.1](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v36.0.0...v36.0.1) (2025-02-06)\n+\n+\n+### Bug Fixes\n+\n+* grant_registry_access gate serviceUsageConsumer ([#2266](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2266)) ([69eca65](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/69eca655edcf5dbd49d5b724ed284ef63bcf6f8c))\n+\n ## [36.0.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v35.0.1...v36.0.0) (2025-02-03)\n \n \n---\nautogen/main/versions.tf.tmpl\n@@ -63,6 +63,6 @@ terraform {\n }\n }\n provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n }\n }\n---\nautogen/safer-cluster/versions.tf.tmpl\n@@ -23,6 +23,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v36.0.1\"\n }\n }\n---\nmodules/auth/versions.tf\n@@ -26,6 +26,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:auth/v36.0.1\"\n }\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v36.0.1\"\n }\n }\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v36.0.1\"\n }\n }\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/beta-private-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v36.0.1\"\n }\n }\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/beta-public-cluster/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v36.0.1\"\n }\n }\n---\nmodules/binary-authorization/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v36.0.1\"\n }\n }\n---\nmodules/fleet-app-operator-permissions/versions.tf\n@@ -33,7 +33,7 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:fleet-app-operator-permissions/v36.0.1\"\n }\n }\n \n---\nmodules/fleet-membership/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n }\n }\n---\nmodules/hub-legacy/versions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:hub/v36.0.1\"\n }\n }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/private-cluster/versions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v36.0.1\"\n }\n }\n---\nmodules/safer-cluster-update-variant/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v36.0.1\"\n }\n }\n---\nmodules/safer-cluster/versions.tf\n@@ -21,6 +21,6 @@ terraform {\n required_version = \">=1.3\"\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.0\"\n+ }\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v36.0.1\"\n }\n }\n---\nmodules/services/versions.tf\n@@ -19,6 +19,6 @@ terraform {\n required_version = \">= 1.3\"\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:services/v36.0.1\"\n }\n }\n---\nmodules/workload-identity/versions.tf\n@@ -30,6 +30,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v36.0.1\"\n }\n }\n---\nversions.tf\n@@ -33,6 +33,6 @@ terraform {\n }\n }\n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine/v36.0.1\"\n }\n }\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis should have been `var.grant_registry_access` gated like `cluster_service_account_artifact_registry`.\n\n---\n\nChoice A:\nautogen/main/sa.tf.tmpl\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account {% if autopilot_cluster != true %}&& var.enable_gcfs {% endif %}? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access {% if autopilot_cluster != true %}&& var.enable_gcfs {% endif %}? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-autopilot-private-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-autopilot-public-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-private-cluster-update-variant/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-private-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-public-cluster-update-variant/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-public-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/private-cluster-update-variant/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/private-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nsa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\n\n\n---\n\nChoice B:\nautogen/main/sa.tf.tmpl\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account {% if autopilot_cluster != true %}&& var.enable_gcfs {% endif %}? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access {% if autopilot_cluster != true %}&& var.enable_gcfs {% endif %}? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-autopilot-private-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-autopilot-public-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-private-cluster-update-variant/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-private-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-public-cluster-update-variant/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-public-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/private-cluster-update-variant/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/private-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nsa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\n\n\n---\n\nChoice C:\nautogen/main/sa.tf.tmpl\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account {% if autopilot_cluster != true %}&& var.enable_gcfs {% endif %}? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access {% if autopilot_cluster != true %}&& var.enable_gcfs {% endif %}? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-autopilot-private-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-autopilot-public-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-private-cluster-update-variant/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n && project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-private-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-public-cluster-update-variant/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-public-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/private-cluster-update-variant/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/private-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nsa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\n\n\n---\n\nChoice D:\nautogen/main/sa.tf.tmpl\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account {% if autopilot_cluster != true %}&& var.enable_gcfs {% endif %}? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access {% if autopilot_cluster != true %}&& var.enable_gcfs {% endif %}? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-autopilot-private-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-autopilot-public-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-private-cluster-update-variant/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-private-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-public-cluster-update-variant/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/beta-public-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = resource && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/private-cluster-update-variant/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nmodules/private-cluster/sa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\nsa.tf\n@@ -82,7 +82,7 @@ resource \"google_project_iam_member\" \"cluster_service_account_artifact_registry\"\n }\n \n resource \"google_project_iam_member\" \"cluster_service_account_service_usage_consumer\" {\n- for_each = var.create_service_account && var.enable_gcfs ? toset(local.registry_projects_list) : []\n+ for_each = var.create_service_account && var.grant_registry_access && var.enable_gcfs ? toset(local.registry_projects_list) : []\n project = each.key\n role = \"roles/serviceusage.serviceUsageConsumer\"\n member = \"serviceAccount:${google_service_account.cluster_service_account[0].email}\"\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nmodules/safer-cluster-update-variant/README.md\n@@ -226,6 +226,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n+| enable\\_secret\\_manager\\_addon | Enable the Secret Manager add-on for this cluster | `bool` | `false` | no |\n | enable\\_shielded\\_nodes | Enable Shielded Nodes features on all nodes in this cluster. | `bool` | `true` | no |\n | enable\\_vertical\\_pod\\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `false` | no |\n | filestore\\_csi\\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -214,4 +214,6 @@ module \"gke\" {\n // Enabling security posture\n security_posture_mode = var.security_posture_mode\n security_posture_vulnerability_mode = var.security_posture_vulnerability_mode\n+\n+ enable_secret_manager_addon = var.enable_secret_manager_addon\n }\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -521,6 +521,12 @@ variable \"enable_gcfs\" {\n default = false\n }\n \n+variable \"enable_secret_manager_addon\" {\n+ description = \"Enable the Secret Manager add-on for this cluster\"\n+ type = bool\n+ default = false\n+}\n+\n variable \"enable_mesh_certificates\" {\n type = bool\n default = false\n---\nmodules/safer-cluster/README.md\n@@ -226,6 +226,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true \"Enable `bool` | `true` | no |\n+| enable\\_secret\\_manager\\_addon | Enable the Secret Manager add-on for this cluster | `bool` | `false` | no |\n | enable\\_shielded\\_nodes | Enable Shielded Nodes features on all nodes in this cluster. | `bool` | `true` | no |\n | enable\\_vertical\\_pod\\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `false` | no |\n | filestore\\_csi\\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -214,4 +214,6 @@ module \"gke\" {\n // Enabling security posture\n security_posture_mode = var.security_posture_mode\n security_posture_vulnerability_mode = var.security_posture_vulnerability_mode\n+\n+ enable_secret_manager_addon = var.enable_secret_manager_addon\n }\n---\nmodules/safer-cluster/variables.tf\n@@ -521,6 +521,12 @@ variable \"enable_gcfs\" {\n default = false\n }\n \n+variable \"enable_secret_manager_addon\" {\n+ description = \"Enable the Secret Manager add-on for this cluster\"\n+ type = bool\n+ default = false\n+}\n+\n variable \"enable_mesh_certificates\" {\n type = bool\n default = false\n---\n\n\n---\n\nChoice B:\nmodules/safer-cluster-update-variant/README.md\n@@ -226,6 +226,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n+| enable\\_secret\\_manager\\_addon | Enable the Secret Manager add-on for this cluster | `bool` | `false` | no |\n | enable\\_shielded\\_nodes | Enable Shielded Nodes features on all nodes in this cluster. | `bool` | `true` | no |\n | enable\\_vertical\\_pod\\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `false` | no |\n | filestore\\_csi\\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -214,4 +214,6 @@ module \"gke\" {\n // Enabling security posture\n security_posture_mode = var.security_posture_mode\n security_posture_vulnerability_mode = var.security_posture_vulnerability_mode\n+\n+ enable_secret_manager_addon = var.enable_secret_manager_addon\n }\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -521,6 +521,12 @@ variable \"enable_gcfs\" {\n default = false\n }\n \n+variable \"enable_secret_manager_addon\" {\n+ description = \"Enable the Secret Manager add-on for this cluster\"\n+ type = bool\n+ default = false\n+}\n+\n variable \"enable_mesh_certificates\" {\n type = bool\n default = false\n---\nmodules/safer-cluster/README.md\n@@ -226,6 +226,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n+| enable\\_secret\\_manager\\_addon | Enable the Secret Manager add-on for this cluster | `bool` | `false` | no |\n | enable\\_shielded\\_nodes | Enable Shielded Nodes features on all nodes in this cluster. | `bool` | `true` | no |\n | enable\\_vertical\\_pod\\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `false` | no |\n | filestore\\_csi\\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -214,4 +214,6 @@ module \"gke\" {\n // Enabling security posture\n security_posture_mode = var.security_posture_mode\n security_posture_vulnerability_mode = var.security_posture_vulnerability_mode\n+\n+ enable_secret_manager_addon = var.enable_secret_manager_addon\n }\n---\nmodules/safer-cluster/variables.tf\n@@ -521,6 +521,12 @@ variable \"enable_gcfs\" {\n default = false\n }\n \n+variable \"enable_secret_manager_addon\" {\n+ description = \"Enable the Secret Manager add-on for this cluster\"\n+ type = bool\n+ default = false\n+}\n+\n variable \"enable_mesh_certificates\" {\n type = bool\n default = false\n---\n\n\n---\n\nChoice C:\nmodules/safer-cluster-update-variant/README.md\n@@ -226,6 +226,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n+| enable\\_secret\\_manager\\_addon | Enable the Secret Manager add-on for this cluster | `bool` | `false` | no |\n | enable\\_shielded\\_nodes | Enable Shielded Nodes features on all nodes in this cluster. | `bool` | `true` | no |\n | enable\\_vertical\\_pod\\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `false` | no |\n | filestore\\_csi\\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -214,4 +214,6 @@ module \"gke\" {\n // Enabling security posture\n security_posture_mode = var.security_posture_mode\n security_posture_vulnerability_mode = var.security_posture_vulnerability_mode\n+\n+ enable_secret_manager_addon = var.enable_secret_manager_addon\n }\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -521,6 +521,12 @@ variable \"enable_gcfs\" {\n default = false\n }\n \n+variable \"enable_secret_manager_addon\" {\n+ description = \"Enable the Secret Manager add-on for this cluster\"\n+ type = bool\n+ default = false\n+}\n+\n variable \"enable_mesh_certificates\" {\n type Controls = bool\n default = false\n---\nmodules/safer-cluster/README.md\n@@ -226,6 +226,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n+| enable\\_secret\\_manager\\_addon | Enable the Secret Manager add-on for this cluster | `bool` | `false` | no |\n | enable\\_shielded\\_nodes | Enable Shielded Nodes features on all nodes in this cluster. | `bool` | `true` | no |\n | enable\\_vertical\\_pod\\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `false` | no |\n | filestore\\_csi\\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -214,4 +214,6 @@ module \"gke\" {\n // Enabling security posture\n security_posture_mode = var.security_posture_mode\n security_posture_vulnerability_mode = var.security_posture_vulnerability_mode\n+\n+ enable_secret_manager_addon = var.enable_secret_manager_addon\n }\n---\nmodules/safer-cluster/variables.tf\n@@ -521,6 +521,12 @@ variable \"enable_gcfs\" {\n default = false\n }\n \n+variable \"enable_secret_manager_addon\" {\n+ description = \"Enable the Secret Manager add-on for this cluster\"\n+ type = bool\n+ default = false\n+}\n+\n variable \"enable_mesh_certificates\" {\n type = bool\n default = false\n---\n\n\n---\n\nChoice D:\nmodules/safer-cluster-update-variant/README.md\n@@ -226,6 +226,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the adjusts private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n+| enable\\_secret\\_manager\\_addon | Enable the Secret Manager add-on for this cluster | `bool` | `false` | no |\n | enable\\_shielded\\_nodes | Enable Shielded Nodes features on all nodes in this cluster. | `bool` | `true` | no |\n | enable\\_vertical\\_pod\\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `false` | no |\n | filestore\\_csi\\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -214,4 +214,6 @@ module \"gke\" {\n // Enabling security posture\n security_posture_mode = var.security_posture_mode\n security_posture_vulnerability_mode = var.security_posture_vulnerability_mode\n+\n+ enable_secret_manager_addon = var.enable_secret_manager_addon\n }\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -521,6 +521,12 @@ variable \"enable_gcfs\" {\n default = false\n }\n \n+variable \"enable_secret_manager_addon\" {\n+ description = \"Enable the Secret Manager add-on for this cluster\"\n+ type = bool\n+ default = false\n+}\n+\n variable \"enable_mesh_certificates\" {\n type = bool\n default = false\n---\nmodules/safer-cluster/README.md\n@@ -226,6 +226,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n+| enable\\_secret\\_manager\\_addon | Enable the Secret Manager add-on for this cluster | `bool` | `false` | no |\n | enable\\_shielded\\_nodes | Enable Shielded Nodes features on all nodes in this cluster. | `bool` | `true` | no |\n | enable\\_vertical\\_pod\\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `false` | no |\n | filestore\\_csi\\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -214,4 +214,6 @@ module \"gke\" {\n // Enabling security posture\n security_posture_mode = var.security_posture_mode\n security_posture_vulnerability_mode = var.security_posture_vulnerability_mode\n+\n+ enable_secret_manager_addon = var.enable_secret_manager_addon\n }\n---\nmodules/safer-cluster/variables.tf\n@@ -521,6 +521,12 @@ variable \"enable_gcfs\" {\n default = false\n }\n \n+variable \"enable_secret_manager_addon\" {\n+ description = \"Enable the Secret Manager add-on for this cluster\"\n+ type = bool\n+ default = false\n+}\n+\n variable \"enable_mesh_certificates\" {\n type = bool\n default = false\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ndocs/upgrading_to_v36.0.md\n@@ -1,6 +1,9 @@\n # Upgrading to v36.0\n The v36.0 release of *kubernetes-engine* is a backwards incompatible release.\n \n+### Google Cloud Platform Provider upgrade\n+The Terraform has Engine Module now requires version 6.14 or higher of the Google Cloud Platform Providers.\n+\n ### var.enable_gcfs removed from Autopilot sub-modules\n The variable `enable_gcfs` has been removed from the Autopilot sub-modules. Autopilot clusters that run GKE version `1.25.5-gke.1000` and later use [Image streaming](https://cloud.google.com/kubernetes-engine/docs/how-to/image-streaming).\n \n---\n\n\n---\n\nChoice B:\ndocs/upgrading_to_v36.0.md\n@@ -1,6 +1,9 @@\n # Upgrading to v36.0\n The v36.0 release of *kubernetes-engine* is a backwards incompatible release.\n \n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6.14 or higher of docs/upgrading_to_v36.0.md\n@@ Google Cloud Platform Providers.\n+\n ### var.enable_gcfs removed from Autopilot sub-modules\n The variable `enable_gcfs` has been removed from the Autopilot sub-modules. Autopilot clusters that run GKE version `1.25.5-gke.1000` and later use [Image streaming](https://cloud.google.com/kubernetes-engine/docs/how-to/image-streaming).\n \n---\n\n\n---\n\nChoice C:\ndocs/upgrading_to_v36.0.md\n@@ -1,6 +1,9 @@\n # Upgrading to v36.0\n The v36.0 release of *kubernetes-engine* is a backwards incompatible release.\n \n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6.14 or higher of the Google Cloud Platform Providers.\n+\n ### var.enable_gcfs removed from Autopilot sub-modules\n The variable `enable_gcfs` has been removed from the Autopilot sub-modules. Autopilot clusters that run GKE version `1.25.5-gke.1000` and later use [Image streaming](https://cloud.google.com/kubernetes-engine/docs/how-to/image-streaming).\n \n---\n\n\n---\n\nChoice D:\ndocs/upgrading_to_v36.0.md\n@@ -1,6 +1,9 @@\n # Upgrading to v36.0\n Provider v36.0 release of *kubernetes-engine* is a backwards incompatible release.\n \n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6.14 or higher of the Google Cloud Platform Providers.\n+\n ### var.enable_gcfs removed from Autopilot sub-modules\n The variable `enable_gcfs` has been removed from the Autopilot sub-modules. Autopilot clusters that run GKE version `1.25.5-gke.1000` and later use [Image streaming](https://cloud.google.com/kubernetes-engine/docs/how-to/image-streaming).\n \n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nautogen/safer-cluster/main.tf.tmpl\n@@ -97,7 +97,9 @@ module \"gke\" {\n node_pools_taints = var.node_pools_taints\n node_pools_tags = var.node_pools_tags\n \n- node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls\n+ node_pools_cgroup_mode = var.node_pools_cgroup_mode\n \n cluster_autoscaling = var.cluster_autoscaling\n \n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -224,6 +224,25 @@ variable \"node_pools_oauth_scopes\" {\n }\n }\n \n+variable \"node_pools_linux_node_configs_sysctls\" {\n+ type = map(map(string))\n+ description = \"Map of maps containing linux node config sysctls by node-pool name\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+variable \"node_pools_cgroup_mode\" {\n+ type = map(string)\n+ description = \"Map of strings containing cgroup node config by node-pool name\"\n+\n+ default = {\n+ all = \"\"\n+ default-node-pool = \"\"\n+ }\n+}\n+\n variable \"cluster_autoscaling\" {\n type = object({\n enabled = bool\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -257,7 +257,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | network | The VPC network to host the cluster in | `string` | n/a | yes |\n | network\\_project\\_id | The project ID of the shared VPC's host (for shared vpc support) | `string` | `\"\"` | no |\n | node\\_pools | List of maps containing node pools | `list(map(string))` | <pre>[<br> {<br> \"name\": \"default-node-pool\"<br> }<br>]</pre> | no |\n+| node\\_pools\\_cgroup\\_mode | Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br> \"all\": \"\",<br> \"default-node-pool\": \"\"<br>}</pre> | no |\n | node\\_pools\\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n+| node\\_pools\\_linux\\_node\\_configs\\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_metadata Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_oauth\\_scopes | Map of lists containing node oauth scopes by node-pool name | `map(list(string))` | <pre>{<br> \"all\": [<br> \"https://www.googleapis.com/auth/cloud-platform\"<br> ],<br> \"default-node-pool\": []<br>}</pre> | no |\n | node\\_pools\\_resource\\_labels | Map of maps containing resource labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -93,7 +93,9 @@ module \"gke\" {\n node_pools_taints = var.node_pools_taints\n node_pools_tags = var.node_pools_tags\n \n- node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls\n+ node_pools_cgroup_mode = var.node_pools_cgroup_mode\n \n cluster_autoscaling = var.cluster_autoscaling\n \n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -224,6 +224,25 @@ variable \"node_pools_oauth_scopes\" {\n }\n }\n \n+variable \"node_pools_linux_node_configs_sysctls\" {\n+ type = map(map(string))\n+ description = \"Map of maps containing linux node config sysctls by node-pool name\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+variable \"node_pools_cgroup_mode\" {\n+ type = map(string)\n+ description = \"Map of strings containing cgroup node config by node-pool name\"\n+\n+ default = {\n+ all = \"\"\n+ default-node-pool = \"\"\n+ }\n+}\n+\n variable \"cluster_autoscaling\" {\n type = object({\n enabled = bool\n---\nmodules/safer-cluster/README.md\n@@ -257,7 +257,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | network | The VPC network to host the cluster in | `string` | n/a | yes |\n | network\\_project\\_id | The project ID of the shared VPC's host (for shared vpc support) | `string` | `\"\"` | no |\n | node\\_pools | List of maps containing node pools | `list(map(string))` | <pre>[<br> {<br> \"name\": \"default-node-pool\"<br> }<br>]</pre> | no |\n+| node\\_pools\\_cgroup\\_mode | Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br> \"all\": \"\",<br> \"default-node-pool\": \"\"<br>}</pre> | no |\n | node\\_pools\\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n+| node\\_pools\\_linux\\_node\\_configs\\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_oauth\\_scopes | Map of lists containing node oauth scopes by node-pool name | `map(list(string))` | <pre>{<br> \"all\": [<br> \"https://www.googleapis.com/auth/cloud-platform\"<br> ],<br> \"default-node-pool\": []<br>}</pre> | no |\n | node\\_pools\\_resource\\_labels | Map of maps containing resource labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n---\nmodules/safer-cluster/main.tf\n@@ -93,7 +93,9 @@ module \"gke\" {\n node_pools_taints = var.node_pools_taints\n node_pools_tags = var.node_pools_tags\n \n- node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls\n+ node_pools_cgroup_mode = var.node_pools_cgroup_mode\n \n cluster_autoscaling = var.cluster_autoscaling\n \n---\nmodules/safer-cluster/variables.tf\n@@ -224,6 +224,25 @@ variable \"node_pools_oauth_scopes\" {\n }\n }\n \n+variable \"node_pools_linux_node_configs_sysctls\" {\n+ type = map(map(string))\n+ description = \"Map of maps containing linux node config sysctls by node-pool name\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+variable \"node_pools_cgroup_mode\" {\n+ type = map(string)\n+ description = \"Map of strings containing cgroup node config by node-pool name\"\n+\n+ default = {\n+ all = \"\"\n+ default-node-pool = \"\"\n+ }\n+}\n+\n variable \"cluster_autoscaling\" {\n type = object({\n enabled = bool\n---\n\n\n---\n\nChoice B:\nautogen/safer-cluster/main.tf.tmpl\n@@ -97,7 +97,9 @@ module \"gke\" {\n node_pools_taints = var.node_pools_taints\n node_pools_tags = var.node_pools_tags\n \n- node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls\n+ node_pools_cgroup_mode = var.node_pools_cgroup_mode\n \n cluster_autoscaling = var.cluster_autoscaling\n \n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -224,6 +224,25 @@ variable \"node_pools_oauth_scopes\" {\n }\n }\n \n+variable \"node_pools_linux_node_configs_sysctls\" {\n+ type = map(map(string))\n+ description = \"Map of maps containing linux node config sysctls by node-pool name\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+variable \"node_pools_cgroup_mode\" {\n+ type = map(string)\n+ description = \"Map of strings containing cgroup node config by node-pool name\"\n+\n+ default = {\n+ all = \"\"\n+ default-node-pool = \"\"\n+ }\n+}\n+\n variable \"cluster_autoscaling\" {\n type = object({\n enabled = bool\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -257,7 +257,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | network | The VPC network to host the cluster in | `string` | n/a | yes |\n | network\\_project\\_id | The project ID of the shared VPC's host (for shared vpc support) | `string` | `\"\"` | no |\n | node\\_pools | List of maps containing node pools | `list(map(string))` | <pre>[<br> {<br> \"name\": \"default-node-pool\"<br> }<br>]</pre> | no |\n+| node\\_pools\\_cgroup\\_mode | Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br> \"all\": \"\",<br> \"default-node-pool\": \"\"<br>}</pre> | no |\n | node\\_pools\\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n+| node\\_pools\\_linux\\_node\\_configs\\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_oauth\\_scopes | Map of lists containing node oauth scopes by node-pool name | `map(list(string))` | <pre>{<br> \"all\": [<br> \"https://www.googleapis.com/auth/cloud-platform\"<br> ],<br> \"default-node-pool\": []<br>}</pre> | no |\n | node\\_pools\\_resource\\_labels | Map of maps containing resource labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -93,7 +93,9 @@ module \"gke\" {\n node_pools_taints = var.node_pools_taints\n node_pools_tags = var.node_pools_tags\n \n- node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls\n+ node_pools_cgroup_mode = var.node_pools_cgroup_mode\n \n cluster_autoscaling = var.cluster_autoscaling\n \n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -224,6 +224,25 @@ variable \"node_pools_oauth_scopes\" {\n }\n }\n \n+variable \"node_pools_linux_node_configs_sysctls\" {\n+ type = map(map(string))\n+ description = \"Map of maps containing linux node config sysctls by node-pool name\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+variable \"node_pools_cgroup_mode\" {\n+ type = map(string)\n+ description = \"Map of strings containing cgroup node config by node-pool name\"\n+\n+ default = {\n+ all = \"\"\n+ default-node-pool = \"\"\n+ }\n+}\n+\n variable \"cluster_autoscaling\" {\n type = object({\n enabled = bool\n---\nmodules/safer-cluster/README.md\n@@ -257,7 +257,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | network | The VPC network to host the cluster in | `string` | n/a | yes |\n | network\\_project\\_id | The project ID of the shared VPC's host (for shared vpc support) | `string` | `\"\"` | no |\n | node\\_pools | List of maps containing node pools | `list(map(string))` | <pre>[<br> {<br> \"name\": \"default-node-pool\"<br> }<br>]</pre> | no |\n+| node\\_pools\\_cgroup\\_mode | Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br> \"all\": \"\",<br> \"default-node-pool\": \"\"<br>}</pre> | no |\n | node\\_pools\\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n+| node\\_pools\\_linux\\_node\\_configs\\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_oauth\\_scopes | Map of lists containing node oauth scopes by node-pool name | `map(list(string))` | <pre>{<br> \"all\": [<br> \"https://www.googleapis.com/auth/cloud-platform\"<br> ],<br> \"default-node-pool\": []<br>}</pre> | no |\n | node\\_pools\\_resource\\_labels | Map of maps containing resource labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n---\nmodules/safer-cluster/main.tf\n@@ -93,7 +93,9 @@ module \"gke\" {\n node_pools_taints = var.node_pools_taints\n node_pools_tags = var.node_pools_tags\n \n- node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls\n+ node_pools_cgroup_mode = var.node_pools_cgroup_mode\n \n cluster_autoscaling = var.cluster_autoscaling\n \n---\nmodules/safer-cluster/variables.tf\n@@ -224,6 +224,25 @@ variable \"node_pools_oauth_scopes\" {\n }\n }\n \n+variable \"node_pools_linux_node_configs_sysctls\" {\n+ type = map(map(string))\n+ description = \"Map of maps containing linux node config sysctls by node-pool name\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+variable \"node_pools_cgroup_mode\" {\n+ type = map(string)\n+ description = \"Map of strings containing cgroup node config by node-pool name\"\n+\n+ default = {\n+ all = \"\"\n+ default-node-pool = \"\"\n+ }\n+}\n+\n variable \"cluster_autoscaling\" {\n type = object({\n enabled = bool\n---\n\n\n---\n\nChoice C:\nautogen/safer-cluster/main.tf.tmpl\n@@ -97,7 +97,9 @@ module \"gke\" {\n node_pools_taints = var.node_pools_taints\n node_pools_tags = var.node_pools_tags\n \n- node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls\n+ node_pools_cgroup_mode = var.node_pools_cgroup_mode\n \n cluster_autoscaling = var.cluster_autoscaling\n \n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -224,6 +224,25 @@ variable \"node_pools_oauth_scopes\" {\n }\n }\n \n+variable \"node_pools_linux_node_configs_sysctls\" {\n+ type = map(map(string))\n+ description = \"Map of maps containing linux node config sysctls by node-pool name\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+variable \"node_pools_cgroup_mode\" {\n+ type = map(string)\n+ description = \"Map of strings containing cgroup node config by node-pool name\"\n+\n+ default = {\n+ all = \"\"\n+ default-node-pool = \"\"\n+ }\n+}\n+\n variable \"cluster_autoscaling\" {\n type = object({\n enabled = bool\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -257,7 +257,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | network | The VPC network to host the cluster in | `string` | n/a | yes |\n | network\\_project\\_id | The project ID of the shared VPC's host (for shared vpc support) | `string` | `\"\"` | no |\n | node\\_pools | List of maps containing node pools | `list(map(string))` | <pre>[<br> {<br> \"name\": \"default-node-pool\"<br> }<br>]</pre> | no |\n+| node\\_pools\\_cgroup\\_mode | Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br> \"all\": \"\",<br> \"default-node-pool\": \"\"<br>}</pre> | no |\n | node\\_pools\\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n+| node\\_pools\\_linux\\_node\\_configs\\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_oauth\\_scopes | Map of lists containing node oauth scopes by node-pool name | `map(list(string))` | <pre>{<br> \"all\": [<br> \"https://www.googleapis.com/auth/cloud-platform\"<br> ],<br> \"default-node-pool\": []<br>}</pre> | no |\n | node\\_pools\\_resource\\_labels | Map of maps containing resource labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -93,7 +93,9 @@ module \"gke\" {\n node_pools_taints = var.node_pools_taints\n node_pools_tags = var.node_pools_tags\n \n- node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls\n+ node_pools_cgroup_mode = var.node_pools_cgroup_mode\n \n cluster_autoscaling = var.cluster_autoscaling\n \n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -224,6 +224,25 @@ variable \"node_pools_oauth_scopes\" {\n }\n }\n \n+variable \"node_pools_linux_node_configs_sysctls\" {\n+ type = map(map(string))\n+ description = \"Map of maps containing linux node config sysctls by node-pool name\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+variable \"node_pools_cgroup_mode\" {\n+ type = map(string)\n+ description = \"Map of strings containing cgroup node config by node-pool name\"\n+\n+ default = {\n+ all = \"\"\n+ default-node-pool = \"\"\n+ }\n+}\n+\n variable \"cluster_autoscaling\" {\n type = object({\n enabled = bool\n---\nmodules/safer-cluster/README.md\n@@ -257,7 +257,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | network | The VPC network to host the cluster in | `string` | n/a | yes |\n | network\\_project\\_id | The project ID of the shared VPC's host (for shared vpc support) | `string` | `\"\"` | no |\n | node\\_pools | List of maps containing node pools | `list(map(string))` | <pre>[<br> {<br> \"name\": \"default-node-pool\"<br> }<br>]</pre> | no |\n+| node\\_pools\\_cgroup\\_mode -224,6 Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br> \"all\": \"\",<br> \"default-node-pool\": \"\"<br>}</pre> | no |\n | node\\_pools\\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n+| node\\_pools\\_linux\\_node\\_configs\\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_oauth\\_scopes | Map of lists containing node oauth scopes by node-pool name | `map(list(string))` | <pre>{<br> \"all\": [<br> \"https://www.googleapis.com/auth/cloud-platform\"<br> ],<br> \"default-node-pool\": []<br>}</pre> | no |\n | node\\_pools\\_resource\\_labels | Map of maps containing resource labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n---\nmodules/safer-cluster/main.tf\n@@ -93,7 +93,9 @@ module \"gke\" {\n node_pools_taints = var.node_pools_taints\n node_pools_tags = var.node_pools_tags\n \n- node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls\n+ node_pools_cgroup_mode = var.node_pools_cgroup_mode\n \n cluster_autoscaling = var.cluster_autoscaling\n \n---\nmodules/safer-cluster/variables.tf\n@@ -224,6 +224,25 @@ variable \"node_pools_oauth_scopes\" {\n }\n }\n \n+variable \"node_pools_linux_node_configs_sysctls\" {\n+ type = map(map(string))\n+ description = \"Map of maps containing linux node config sysctls by node-pool name\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+variable \"node_pools_cgroup_mode\" {\n+ type = map(string)\n+ description = \"Map of strings containing cgroup node config by node-pool name\"\n+\n+ default = {\n+ all = \"\"\n+ default-node-pool = \"\"\n+ }\n+}\n+\n variable \"cluster_autoscaling\" {\n type = object({\n enabled = bool\n---\n\n\n---\n\nChoice D:\nautogen/safer-cluster/main.tf.tmpl\n@@ -97,7 +97,9 @@ module \"gke\" {\n node_pools_taints = var.node_pools_taints\n node_pools_tags = var.node_pools_tags\n \n- node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls\n+ node_pools_cgroup_mode = var.node_pools_cgroup_mode\n \n cluster_autoscaling = var.cluster_autoscaling\n \n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -224,6 +224,25 @@ variable \"node_pools_oauth_scopes\" {\n }\n }\n \n+variable \"node_pools_linux_node_configs_sysctls\" {\n+ type = map(map(string))\n+ description = \"Map of maps containing linux node config sysctls by node-pool name\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+variable \"node_pools_cgroup_mode\" {\n+ type = map(string)\n+ description = \"Map of strings containing cgroup node config by node-pool name\"\n+\n+ default = {\n+ all = \"\"\n+ default-node-pool = \"\"\n+ }\n+}\n+\n variable \"cluster_autoscaling\" {\n type = object({\n enabled = bool\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -257,7 +257,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | network | The VPC network to host the cluster in | `string` | n/a | yes |\n | network\\_project\\_id | The project ID of the shared VPC's host (for shared vpc support) | `string` | `\"\"` | no |\n | node\\_pools | List of maps containing node pools | `list(map(string))` | <pre>[<br> {<br> \"name\": \"default-node-pool\"<br> }<br>]</pre> | no |\n+| node\\_pools\\_cgroup\\_mode | Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br> \"all\": \"\",<br> \"default-node-pool\": \"\"<br>}</pre> | no |\n | node\\_pools\\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n+| node\\_pools\\_linux\\_node\\_configs\\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_oauth\\_scopes | Map of lists containing node oauth scopes by node-pool name | `map(list(string))` | <pre>{<br> \"all\": [<br> \"https://www.googleapis.com/auth/cloud-platform\"<br> ],<br> \"default-node-pool\": []<br>}</pre> | no |\n | node\\_pools\\_resource\\_labels | Map of maps containing resource labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -93,7 +93,9 @@ module \"gke\" {\n node_pools_taints = var.node_pools_taints\n node_pools_tags = var.node_pools_tags\n \n- node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls\n+ node_pools_cgroup_mode = var.node_pools_cgroup_mode\n \n cluster_autoscaling = var.cluster_autoscaling\n \n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -224,6 +224,25 @@ variable \"node_pools_oauth_scopes\" {\n }\n }\n \n+variable \"node_pools_linux_node_configs_sysctls\" {\n+ type = map(map(string))\n+ description = \"Map of maps containing linux node config sysctls by node-pool name\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+variable \"node_pools_cgroup_mode\" {\n+ type = map(string)\n+ description = \"Map of strings containing cgroup node config by node-pool name\"\n+\n+ default = {\n+ all = \"\"\n+ default-node-pool = \"\"\n+ }\n+}\n+\n variable \"cluster_autoscaling\" {\n type = object({\n enabled = bool\n---\nmodules/safer-cluster/README.md\n@@ -257,7 +257,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | network | The VPC network to host the cluster in | `string` | n/a | yes |\n | network\\_project\\_id | The project ID of the shared VPC's host (for shared vpc support) | `string` | `\"\"` | no |\n | node\\_pools | List of maps containing node pools | `list(map(string))` | <pre>[<br> {<br> \"name\": \"default-node-pool\"<br> }<br>]</pre> | no |\n+| node\\_pools\\_cgroup\\_mode | Map of strings containing cgroup node config by node-pool name | `map(string)` | <pre>{<br> \"all\": \"\",<br> \"default-node-pool\": \"\"<br>}</pre> | no |\n | node\\_pools\\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n+| node\\_pools\\_linux\\_node\\_configs\\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n | node\\_pools\\_oauth\\_scopes | Map of lists containing node oauth scopes by node-pool name | `map(list(string))` | <pre>{<br> \"all\": [<br> \"https://www.googleapis.com/auth/cloud-platform\"<br> ],<br> \"default-node-pool\": []<br>}</pre> | no |\n | node\\_pools\\_resource\\_labels | Map of maps containing resource labels by node-pool name | `map(map(string))` | <pre>{<br> \"all\": {},<br> \"default-node-pool\": {}<br>}</pre> | no |\n---\nmodules/safer-cluster/main.tf\n@@ -93,7 +93,9 @@ module \"gke\" {\n node_pools_taints = var.node_pools_taints\n node_pools_tags = var.node_pools_tags\n \n- node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_oauth_scopes = var.node_pools_oauth_scopes\n+ node_pools_linux_node_configs_sysctls = var.node_pools_linux_node_configs_sysctls\n+ node_pools_cgroup_mode = var.node_pools_cgroup_mode\n \n cluster_autoscaling = var.cluster_autoscaling\n \n---\nmodules/safer-cluster/variables.tf\n@@ -224,6 +224,25 @@ variable \"node_pools_oauth_scopes\" {\n }\n }\n \n+variable \"node_pools_linux_node_configs_sysctls\" {\n+ type = map(map(string))\n+ description = \"Map of maps containing linux node config sysctls by node-pool name\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+variable \"node_pools_cgroup_mode\" {\n+ type = map(string)\n+ description = \"Map of strings containing cgroup node config by node-pool name\"\n+\n+ default = {\n+ all = \"\"\n+ default-node-pool = \"\"\n+ }\n+}\n+\n variable \"cluster_autoscaling\" {\n type = object({\n enabled = bool\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ndocs/upgrading_to_v36.0.md\n@@ -0,0 +1,26 @@\n+# Upgrading to v36.0\n+The v36.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### var.enable_gcfs removed from Autopilot sub-modules\n+The variable `enable_gcfs` has been removed from the Autopilot sub-modules. Autopilot clusters that run GKE version `1.25.5-gke.1000` and later use [Image streaming](https://cloud.google.com/kubernetes-engine/docs/how-to/image-streaming).\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 35.0\"\n++ version = \"~> 36.0\"\n+\n+- enable_gcfs = true\n+}\n+```\n+\n+### var.logging_variant removed from Autopilot sub-modules\n+The variable `logging_variant` has been removed from the Autopilot sub-modules. It is only [applicable](https://cloud.google.com/kubernetes-engine/docs/how-to/adjust-log-throughput) to Standard clusters.\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 35.0\"\n++ version = \"~> 36.0\"\n+\n+- logging_variant = \"DEFAULT\"\n+}\n+```\n---\n\n\n---\n\nChoice B:\ndocs/upgrading_to_v36.0.md\n@@ -0,0 +1,26 @@\n+# Upgrading to v36.0\n+The v36.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### var.enable_gcfs removed from Autopilot sub-modules\n+The variable `enable_gcfs` has been removed from the Autopilot sub-modules. Autopilot clusters that run GKE version `1.25.5-gke.1000` removed later use [Image streaming](https://cloud.google.com/kubernetes-engine/docs/how-to/image-streaming).\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 35.0\"\n++ version = \"~> 36.0\"\n+\n+- enable_gcfs = true\n+}\n+```\n+\n+### var.logging_variant removed from Autopilot sub-modules\n+The variable `logging_variant` has been removed from the Autopilot sub-modules. It is only [applicable](https://cloud.google.com/kubernetes-engine/docs/how-to/adjust-log-throughput) to Standard clusters.\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 35.0\"\n++ version = \"~> 36.0\"\n+\n+- logging_variant = \"DEFAULT\"\n+}\n+```\n---\n\n\n---\n\nChoice C:\ndocs/upgrading_to_v36.0.md\n@@ -0,0 +1,26 @@\n+# Upgrading to v36.0\n+The v36.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### var.enable_gcfs removed from Autopilot sub-modules\n+The variable `enable_gcfs` has been removed from the Autopilot sub-modules. Autopilot clusters that run GKE version `1.25.5-gke.1000` and later use [Image streaming](https://cloud.google.com/kubernetes-engine/docs/how-to/image-streaming).\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 35.0\"\n++ version = \"~> 36.0\"\n+\n+- enable_gcfs = true\n+}\n+```\n+\n+### var.logging_variant removed from Autopilot sub-modules\n+The variable `logging_variant` has been removed from the Autopilot sub-modules. It is only [applicable](https://cloud.google.com/kubernetes-engine/docs/how-to/adjust-log-throughput) to Standard clusters.\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 35.0\"\n++ version {\n+- = \"~> 36.0\"\n+\n+- logging_variant = \"DEFAULT\"\n+}\n+```\n---\n\n\n---\n\nChoice D:\n -0,0 +1,26 @@\n+# Upgrading to v36.0\n+The v36.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### var.enable_gcfs removed from Autopilot sub-modules\n+The variable `enable_gcfs` has been removed from the Autopilot sub-modules. Autopilot clusters that run GKE version `1.25.5-gke.1000` and later use [Image streaming](https://cloud.google.com/kubernetes-engine/docs/how-to/image-streaming).\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 35.0\"\n++ version = \"~> 36.0\"\n+\n+- enable_gcfs = true\n+}\n+```\n+\n+### var.logging_variant removed from Autopilot sub-modules\n+The variable `logging_variant` has been removed from the Autopilot sub-modules. It is only [applicable](https://cloud.google.com/kubernetes-engine/docs/how-to/adjust-log-throughput) to Standard clusters.\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 35.0\"\n++ version = \"~> 36.0\"\n+\n+- logging_variant = \"DEFAULT\"\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 Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nautogen/main/versions.tf.tmpl\n@@ -34,17 +34,17 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n {% else %}\n required_providers {\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -216,7 +216,7 @@\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n \"kubeletConfig\": {\n- \"insecureKubeletReadonlyPortEnabled\": true\n+ \"insecureKubeletReadonlyPortEnabled\": false\n },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n---\ntest/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json\n@@ -38,7 +38,6 @@\n \"publicEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 3,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\ntest/integration/stub_domains/testdata/TestStubDomains.json\n@@ -36,7 +36,6 @@\n \"publicEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 3,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\ntest/integration/stub_domains_upstream_nameservers/testdata/TestStubDomainsUpstreamNameservers.json\n@@ -36,7 +36,6 @@\n \"publicEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 3,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\ntest/integration/workload_metadata_config/testdata/TestWorkloadMetadataConfig.json\n@@ -35,7 +35,6 @@\n \"privateEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 1,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\n\n\n---\n\nChoice B:\nautogen/main/versions.tf.tmpl\n@@ -34,17 +34,17 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n {% else %}\n required_providers {\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n kubernetes = {\n = source = \"hashicorp/kubernetes\"\n---\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -216,7 +216,7 @@\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n \"kubeletConfig\": {\n- \"insecureKubeletReadonlyPortEnabled\": true\n+ \"insecureKubeletReadonlyPortEnabled\": false\n },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n---\ntest/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json\n@@ -38,7 +38,6 @@\n \"publicEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 3,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\ntest/integration/stub_domains/testdata/TestStubDomains.json\n@@ -36,7 +36,6 @@\n \"publicEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 3,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\ntest/integration/stub_domains_upstream_nameservers/testdata/TestStubDomainsUpstreamNameservers.json\n@@ -36,7 +36,6 @@\n \"publicEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 3,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\ntest/integration/workload_metadata_config/testdata/TestWorkloadMetadataConfig.json\n@@ -35,7 +35,6 @@\n \"privateEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 1,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\n\n\n---\n\nChoice C:\nautogen/main/versions.tf.tmpl\n@@ -34,17 +34,17 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n google google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n {% else %}\n required_providers {\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -216,7 +216,7 @@\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n \"kubeletConfig\": {\n- \"insecureKubeletReadonlyPortEnabled\": true\n+ \"insecureKubeletReadonlyPortEnabled\": false\n },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n---\ntest/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json\n@@ -38,7 +38,6 @@\n \"publicEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 3,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\ntest/integration/stub_domains/testdata/TestStubDomains.json\n@@ -36,7 +36,6 @@\n \"publicEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 3,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\ntest/integration/stub_domains_upstream_nameservers/testdata/TestStubDomainsUpstreamNameservers.json\n@@ -36,7 +36,6 @@\n \"publicEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 3,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\ntest/integration/workload_metadata_config/testdata/TestWorkloadMetadataConfig.json\n@@ -35,7 +35,6 @@\n \"privateEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 1,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\n\n\n---\n\nChoice D:\nautogen/main/versions.tf.tmpl\n@@ -34,17 +34,17 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= < 6.17\"\n }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n {% else %}\n required_providers {\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.14.0, < 7\"\n+ version = \">= 6.14.0, < 6.17\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -216,7 +216,7 @@\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n \"kubeletConfig\": {\n- \"insecureKubeletReadonlyPortEnabled\": true\n+ \"insecureKubeletReadonlyPortEnabled\": false\n },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n---\ntest/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json\n@@ -38,7 +38,6 @@\n \"publicEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 3,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\ntest/integration/stub_domains/testdata/TestStubDomains.json\n@@ -36,7 +36,6 @@\n \"publicEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 3,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\ntest/integration/stub_domains_upstream_nameservers/testdata/TestStubDomainsUpstreamNameservers.json\n@@ -36,7 +36,6 @@\n \"publicEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 3,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\ntest/integration/workload_metadata_config/testdata/TestWorkloadMetadataConfig.json\n@@ -35,7 +35,6 @@\n \"privateEndpoint\": \"KUBERNETES_ENDPOINT\"\n }\n },\n- \"currentNodeCount\": 1,\n \"databaseEncryption\": {\n \"currentState\": \"CURRENT_STATE_DECRYPTED\",\n \"state\": \"DECRYPTED\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nFix #2231 \r\n\r\nThis is not an enhancement; it is a bug.\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -645,7 +645,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nexamples/safer_cluster_iap_bastion/cluster.tf\n@@ -25,7 +25,7 @@ module \"gke\" {\n subnetwork = module.vpc.subnets_names[0]\n ip_range_pods = module.vpc.subnets_secondary_ranges[0][0].range_name\n ip_range_services = module.vpc.subnets_secondary_ranges[0][1].range_name\n- enable_private_endpoint = false\n+ enable_private_endpoint = true\n deletion_protection = false\n master_authorized_networks = [{\n cidr_block = \"${module.bastion.ip_address}/32\"\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -327,7 +327,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -554,7 +554,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -554,7 +554,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -509,7 +509,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/private-cluster/cluster.tf\n@@ -509,7 +509,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -645,7 +645,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nexamples/safer_cluster_iap_bastion/cluster.tf\n@@ -25,7 +25,7 @@ module \"gke\" {\n subnetwork = module.vpc.subnets_names[0]\n ip_range_pods = module.vpc.subnets_secondary_ranges[0][0].range_name\n ip_range_services = module.vpc.subnets_secondary_ranges[0][1].range_name\n- enable_private_endpoint = false\n+ enable_private_endpoint = true\n deletion_protection = false\n master_authorized_networks = [{\n cidr_block = \"${module.bastion.ip_address}/32\"\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -327,7 +327,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -554,7 +554,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n -509,7 allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -554,7 +554,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -509,7 +509,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/private-cluster/cluster.tf\n@@ -509,7 +509,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -645,7 +645,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nexamples/safer_cluster_iap_bastion/cluster.tf\n@@ -25,7 +25,7 @@ module \"gke\" {\n subnetwork = module.vpc.subnets_names[0]\n ip_range_pods = module.vpc.subnets_secondary_ranges[0][0].range_name\n ip_range_services = module.vpc.subnets_secondary_ranges[0][1].range_name\n- enable_private_endpoint = false\n+ enable_private_endpoint = true\n deletion_protection = false\n master_authorized_networks = [{\n cidr_block = \"${module.bastion.ip_address}/32\"\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -327,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -554,7 +554,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -554,7 +554,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -509,7 +509,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/private-cluster/cluster.tf\n@@ -509,7 +509,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -645,7 +645,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nexamples/safer_cluster_iap_bastion/cluster.tf\n@@ -25,7 +25,7 @@ module \"gke\" {\n subnetwork = module.vpc.subnets_names[0]\n ip_range_pods = module.vpc.subnets_secondary_ranges[0][0].range_name\n ip_range_services = module.vpc.subnets_secondary_ranges[0][1].range_name\n- enable_private_endpoint = false\n+ enable_private_endpoint = true\n deletion_protection = false\n master_authorized_networks = [{\n cidr_block = \"${module.bastion.ip_address}/32\"\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -327,7 +327,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -554,7 +554,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -554,7 +554,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -509,7 +509,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = dns_endpoint_config -509,7 +509,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"control_plane_endpoints_config\" {\n- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]\n+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []\n content {\n dns_endpoint_config {\n allow_external_traffic = var.deploy_using_private_endpoint\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis pull request fixes issue #1783 where `cloud_dns_provider` only gets applied when it is set to `CLOUD_DNS`.\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -492,7 +492,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n {% if autopilot_cluster != true %}\n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\" ) ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\ncluster.tf\n@@ -377,7 +377,7 @@ \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -377,7 +377,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/private-cluster/cluster.tf\n@@ -377,7 +377,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -492,7 +492,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n {% if autopilot_cluster != true %}\n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\" ) ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\ncluster.tf\n@@ -377,7 +377,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns dynamic = var.cluster_dns_provider\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -377,7 +377,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/private-cluster/cluster.tf\n@@ -377,7 +377,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -492,7 +492,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n {% if autopilot_cluster != true %}\n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\" ) ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\ncluster.tf\n@@ -377,7 +377,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -377,7 +377,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/private-cluster/cluster.tf\n@@ -377,7 +377,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -492,7 +492,7 @@ resource \"google_container_cluster\" \"primary\" {\n \n {% if autopilot_cluster != true %}\n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\" ) ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\ncluster.tf\n@@ -377,7 +377,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -414,7 +414,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -377,7 +377,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\nmodules/private-cluster/cluster.tf\n@@ -377,7 +377,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n dynamic \"dns_config\" {\n- for_each = var.cluster_dns_provider == \"CLOUD_DNS\" ? [1] : []\n+ for_each = !(var.cluster_dns_provider == \"PROVIDER_UNSPECIFIED\" && var.cluster_dns_scope == \"DNS_SCOPE_UNSPECIFIED\" && var.cluster_dns_domain == \"\") ? [1] : []\n content {\n additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain\n cluster_dns = var.cluster_dns_provider\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nFixes: #2246\n\n---\n\nChoice A:\nautogen/main/outputs.tf.tmpl\n@@ -207,7 +207,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/beta-autopilot-private-cluster/outputs.tf\n@@ -165,7 +165,7 @@ output \"tpu_ipv4_cidr_block\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/beta-private-cluster-update-variant/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/beta-private-cluster/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/private-cluster-update-variant/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/private-cluster/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\ntest/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json\n@@ -200,9 +200,6 @@\n \"mode\": \"GKE_METADATA\"\n }\n },\n- \"locations\": [\n- \"us-central1-a\"\n- ],\n \"management\": {\n \"autoRepair\": true,\n \"autoUpgrade\": true\n---\n\n\n---\n\nChoice B:\nautogen/main/outputs.tf.tmpl\n@@ -207,7 +207,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/beta-autopilot-private-cluster/outputs.tf\n@@ -165,7 +165,7 @@ output \"tpu_ipv4_cidr_block\" {\n \n output \"master_ipv4_cidr_block\" google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/beta-private-cluster-update-variant/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/beta-private-cluster/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/private-cluster-update-variant/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/private-cluster/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\ntest/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json\n@@ -200,9 +200,6 @@\n \"mode\": \"GKE_METADATA\"\n }\n },\n- \"locations\": [\n- \"us-central1-a\"\n- ],\n \"management\": {\n \"autoRepair\": true,\n \"autoUpgrade\": true\n---\n\n\n---\n\nChoice C:\nautogen/main/outputs.tf.tmpl\n@@ -207,7 +207,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/beta-autopilot-private-cluster/outputs.tf\n@@ -165,7 +165,7 @@ output \"tpu_ipv4_cidr_block\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/beta-private-cluster-update-variant/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/beta-private-cluster/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/private-cluster-update-variant/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/private-cluster/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\ntest/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json\n@@ -200,9 +200,6 @@\n \"mode\": \"GKE_METADATA\"\n }\n },\n- \"locations\": [\n- \"us-central1-a\"\n- ],\n \"management\": {\n \"autoRepair\": true,\n \"autoUpgrade\": true\n---\n\n\n---\n\nChoice D:\nautogen/main/outputs.tf.tmpl\n@@ -207,7 +207,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/beta-autopilot-private-cluster/outputs.tf\n@@ -165,7 +165,7 @@ output \"tpu_ipv4_cidr_block\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/beta-private-cluster-update-variant/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/beta-private-cluster/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/private-cluster-update-variant/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\nmodules/private-cluster/outputs.tf\n@@ -192,7 +192,7 @@ output \"mesh_certificates_config\" {\n \n output \"master_ipv4_cidr_block\" {\n description = \"The IP range in CIDR notation used for the hosted master network\"\n- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block\n+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null\n }\n \n output \"peering_name\" {\n---\ntest/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json\n@@ -200,9 +200,6 @@\n \"mode\": \"GKE_METADATA\"\n }\n },\n- \"locations\": [\n- \"us-central1-a\"\n- ],\n \"management\": {\n \"autoRepair\": true,\n \"autoUpgrade\": true\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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/project-factory/google](https://registry.terraform.io/modules/terraform-google-modules/project-factory/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory)) | module | major | `~> 17.0` -> `~> 18.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-project-factory (terraform-google-modules/project-factory/google)</summary>\n\n### [`v18.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/blob/HEAD/CHANGELOG.md#1800-2025-01-04)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/compare/v17.1.0...v18.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TF>=1.3:** update provider and metadata ([#​966](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/966))\n\n##### Bug Fixes\n\n- **TF>=1.3:** update provider and metadata ([#​966](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/966)) ([0bab52d](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/0bab52d3fabab9fa5ba7c45e0fd6630a168537bb))\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS45Mi4wIiwidXBkYXRlZEluVmVyIjoiMzkuOTIuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\nexamples/acm-terraform-blog-part1/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part2/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part3/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = = var.project\n disable_services_on_destroy = false\n---\nexamples/safer_cluster_iap_bastion/apis.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project_id\n disable_services_on_destroy = false\n---\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\ntest/integration/node_pool/testdata/TestNodePool.json\n@@ -86,7 +86,6 @@\n \"clusterIpv4Cidr\": \"192.168.0.0/18\",\n \"clusterIpv4CidrBlock\": \"192.168.0.0/18\",\n \"clusterSecondaryRangeName\": \"cft-gke-test-pods-RANDOM_STRING\",\n- \"defaultPodIpv4RangeUtilization\": 0.0624,\n \"podCidrOverprovisionConfig\": {},\n \"servicesIpv4Cidr\": \"192.168.64.0/18\",\n \"servicesIpv4CidrBlock\": \"192.168.64.0/18\",\n---\ntest/setup/main.tf\n@@ -46,7 +46,7 @@ locals {\n \n module \"gke-project-1\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -70,7 +70,7 @@ module \"gke-project-1\" {\n \n module \"gke-project-2\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -92,7 +92,7 @@ module \"gke-project-2\" {\n # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project\n module \"gke-project-asm\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-asm-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -107,7 +107,7 @@ module \"gke-project-asm\" {\n \n module \"gke-project-fleet\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-fleet-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n---\n\n\n---\n\nChoice B:\nexamples/acm-terraform-blog-part1/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part2/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part3/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/safer_cluster_iap_bastion/apis.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project_id\n disable_services_on_destroy = false\n---\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\ntest/integration/node_pool/testdata/TestNodePool.json\n@@ -86,7 +86,6 @@\n \"clusterIpv4Cidr\": \"192.168.0.0/18\",\n \"clusterIpv4CidrBlock\": \"192.168.0.0/18\",\n \"clusterSecondaryRangeName\": \"cft-gke-test-pods-RANDOM_STRING\",\n- \"defaultPodIpv4RangeUtilization\": 0.0624,\n \"podCidrOverprovisionConfig\": {},\n \"servicesIpv4Cidr\": \"192.168.64.0/18\",\n \"servicesIpv4CidrBlock\": \"192.168.64.0/18\",\n---\ntest/setup/main.tf\n@@ -46,7 +46,7 @@ locals {\n \n module \"gke-project-1\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -70,7 +70,7 @@ module \"gke-project-1\" {\n \n module \"gke-project-2\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -92,7 +92,7 @@ module \"gke-project-2\" {\n # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project\n module \"gke-project-asm\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-asm-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -107,7 +107,7 @@ module \"gke-project-asm\" {\n \n module \"gke-project-fleet\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-fleet-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n---\n\n\n---\n\nChoice C:\nexamples/acm-terraform-blog-part1/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n \n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part2/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part3/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/safer_cluster_iap_bastion/apis.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project_id\n disable_services_on_destroy = false\n---\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\ntest/integration/node_pool/testdata/TestNodePool.json\n@@ -86,7 +86,6 @@\n \"clusterIpv4Cidr\": \"192.168.0.0/18\",\n \"clusterIpv4CidrBlock\": \"192.168.0.0/18\",\n \"clusterSecondaryRangeName\": \"cft-gke-test-pods-RANDOM_STRING\",\n- \"defaultPodIpv4RangeUtilization\": 0.0624,\n \"podCidrOverprovisionConfig\": {},\n \"servicesIpv4Cidr\": \"192.168.64.0/18\",\n \"servicesIpv4CidrBlock\": \"192.168.64.0/18\",\n---\ntest/setup/main.tf\n@@ -46,7 +46,7 @@ locals {\n \n module \"gke-project-1\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -70,7 +70,7 @@ module \"gke-project-1\" {\n \n module \"gke-project-2\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -92,7 +92,7 @@ module \"gke-project-2\" {\n # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project\n module \"gke-project-asm\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-asm-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -107,7 +107,7 @@ module \"gke-project-asm\" {\n \n module \"gke-project-fleet\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-fleet-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n---\n\n\n---\n\nChoice D:\nexamples/acm-terraform-blog-part1/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part2/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part3/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/safer_cluster_iap_bastion/apis.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project_id\n disable_services_on_destroy = false\n---\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\ntest/integration/node_pool/testdata/TestNodePool.json\n@@ -86,7 +86,6 @@\n \"clusterIpv4Cidr\": \"192.168.0.0/18\",\n \"clusterIpv4CidrBlock\": \"192.168.0.0/18\",\n \"clusterSecondaryRangeName\": \"cft-gke-test-pods-RANDOM_STRING\",\n- \"defaultPodIpv4RangeUtilization\": 0.0624,\n \"podCidrOverprovisionConfig\": {},\n \"servicesIpv4Cidr\": \"192.168.64.0/18\",\n \"servicesIpv4CidrBlock\": \"192.168.64.0/18\",\n---\ntest/setup/main.tf\n@@ -46,7 +46,7 @@ locals {\n \n module \"gke-project-1\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -70,7 +70,7 @@ module \"gke-project-1\" {\n \n module \"gke-project-2\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -92,7 +92,7 @@ module \"gke-project-2\" {\n # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project\n module \"gke-project-asm\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-asm-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -107,7 +107,7 @@ module \"gke-project-asm\" {\n \n module \"gke-project-fleet\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-gke-fleet-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n# Pull Request: Custom Monitoring Metrics Writer Role Support \r\n\r\n**Description**\r\nThis pull request introduces support for assigning a custom monitoring metrics writer role (monitoring_metric_writer_role) to the GKE node service account. Previously, the role was hardcoded to roles/monitoring.metricWriter, which could be restrictive for organizations with compliance or custom role requirements.\r\n\r\n**Key changes**\r\n\r\n1. Added Variable\r\n\r\n- A new variable monitoring_metric_writer_role with a default value of roles/monitoring.metricWriter was added.\r\n- This allows users to specify a custom IAM role if needed.\r\n\r\n2. Backward Compatibility:\r\n- Ensured backward compatibility by maintaining the default role (roles/monitoring.metricWriter) for users who do not override the variable.\r\n\r\n**Changes**\r\n1. variables.tf\r\n- Added a new variable monitoring_metric_writer_role with a default value of roles/monitoring.metricWriter.\r\n\r\n\r\n## **Testing**\r\n### 1. **Local Testing**:\r\n- Verified the changes using terraform validate to ensure syntax correctness.\r\n- Used terraform plan to confirm the resource behaves as expected with both default and custom roles.\r\n\r\n### 2. **Test Cases**:\r\n- **Default Role**: Verified that the default role (roles/monitoring.metricWriter) is assigned when no custom role is specified.\r\n- **Custom Role**: Tested with a custom role to ensure the override works as intended.\r\n\r\n## **Impact**\r\n- **Backward Compatible**: Existing users do not need to make any changes, as the default behavior remains unchanged.\r\n- **Enhanced Flexibility**: Users can now assign custom roles for monitoring metrics, meeting organizational compliance requirements.\r\n\r\n**Checklist**\r\n\r\n- [ ✅ ] Added a new variable for the custom role.\r\n- [ ✅ ] Updated documentation in 'variables.tf'.\r\n- [ ✅ ] Verified the changes with local testing.\r\n- [ ✅ ] Ensured backward compatibility.\r\n- [ ✅ ] Ready for review and feedback.\r\n\r\n\r\n\r\n\r\n \r\n\r\n\n\n---\n\nChoice A:\nvariables.tf\n@@ -144,6 +144,12 @@ variable \"maintenance_recurrence\" {\n default = \"\"\n }\n \n+variable \"monitoring_metric_writer_role\" {\n+ type = string\n+ description = \"Custom monitoring metrics writer role for the GKE node service account\"\n+ default = \"roles/monitoring.metricWriter\"\n+}\n+\n variable \"ip_range_pods\" {\n type = GKE description = \"The _name_ of the secondary subnet ip range to use for pods\"\n---\n\n\n---\n\nChoice B:\nvariables.tf\n@@ -144,6 +144,12 @@ variable \"maintenance_recurrence\" {\n default = \"\"\n }\n \n+variable \"monitoring_metric_writer_role\" {\n+ type = string\n+ description = \"Custom monitoring metrics writer role for the GKE node service account\"\n+ default = \"roles/monitoring.metricWriter\"\n+}\n+\n variable \"ip_range_pods\" {\n type = string\n description = \"The _name_ the secondary subnet ip range to use for pods\"\n---\n\n\n---\n\nChoice C:\nvariables.tf\n@@ -144,6 +144,12 @@ variable \"maintenance_recurrence\" {\n default = \"\"\n }\n \n+variable \"monitoring_metric_writer_role\" {\n+ type = string\n+ description = \"Custom monitoring metrics writer role for the GKE node service account\"\n+ default = \"roles/monitoring.metricWriter\"\n+}\n+\n variable \"ip_range_pods\" {\n type = string\n description = \"The _name_ of the secondary subnet ip range to use for pods\"\n---\n\n\n---\n\nChoice D:\nvariables.tf\n@@ -144,6 +144,12 @@ variable \"maintenance_recurrence\" {\n default = \"\"\n }\n \n+variable \"monitoring_metric_writer_role\" {\n+ type = string\n+ description = \"Custom monitoring metrics writer role for the GKE node service account\"\n+ default = \"roles/monitoring.metricWriter\"\n+}\n+\n variable \"ip_range_pods\" {\n type = string\n description = \"The _name_ of the secondary subnet ip range to use service pods\"\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://redirect.github.com/GoogleCloudPlatform/cloud-foundation-toolkit) | `v0.17.3` -> `v0.17.4` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n> [!WARNING]\n> Some dependencies could not be looked up. Check the Dependency Dashboard for more information.\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS45Mi4wIiwidXBkYXRlZEluVmVyIjoiMzkuOTIuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.22.7\n toolchain go1.23.4\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test filippo.io/edwards25519 \tgithub.com/gruntwork-io/terratest v0.48.1\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n@@ -115,7 +115,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n \tgolang.org/x/crypto v0.31.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n-\tgolang.org/x/net v0.31.0 // indirect\n+\tgolang.org/x/net v0.33.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sys v0.28.0 // indirect\n \tgolang.org/x/term v0.27.0 // indirect\n---\ntest/integration/go.sum\n@@ -1,7 +1,7 @@\n filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=\n filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3 h1:+lqTQyIdgr9XbI/onTPpwDnKR8I+MFKuIi6jeO8qDDQ=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3/go.mod h1:7uX+sVrlOPmrpkfuVSoO9qO0tWc23lVVCIQOL9GM5Qs=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4 h1:saMfBNajjOKVOEcK85w5nqdPnRGjfpN4wl1R3Ky2Acc=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4/go.mod h1:/w06M/gJF0Xez24qRHwEo+83bw51a65y8w+J1FtE5hU=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n@@ -272,8 +272,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=\n-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=\n+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=\n+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=\n golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.22.7\n toolchain go1.23.4\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4\n \tgithub.com/gruntwork-io/terratest v0.48.1\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n@@ -115,7 +115,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n \tgolang.org/x/crypto v0.31.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n-\tgolang.org/x/net v0.31.0 // indirect\n+\tgolang.org/x/net v0.33.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sys v0.28.0 // indirect\n \tgolang.org/x/term v0.27.0 // indirect\n---\ntest/integration/go.sum\n@@ -1,7 +1,7 @@\n filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=\n filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3 h1:+lqTQyIdgr9XbI/onTPpwDnKR8I+MFKuIi6jeO8qDDQ=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3/go.mod h1:7uX+sVrlOPmrpkfuVSoO9qO0tWc23lVVCIQOL9GM5Qs=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4 h1:saMfBNajjOKVOEcK85w5nqdPnRGjfpN4wl1R3Ky2Acc=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4/go.mod h1:/w06M/gJF0Xez24qRHwEo+83bw51a65y8w+J1FtE5hU=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n@@ -272,8 +272,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=\n-golang.org/x/net v0.31.0/go.mod @@ v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=\n+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=\n golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go v0.24.0 toolchain go1.23.4\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4\n \tgithub.com/gruntwork-io/terratest v0.48.1\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n@@ -115,7 +115,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n \tgolang.org/x/crypto v0.31.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n-\tgolang.org/x/net v0.31.0 // indirect\n+\tgolang.org/x/net v0.33.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sys v0.28.0 // indirect\n \tgolang.org/x/term v0.27.0 // indirect\n---\ntest/integration/go.sum\n@@ -1,7 +1,7 @@\n filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=\n filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3 h1:+lqTQyIdgr9XbI/onTPpwDnKR8I+MFKuIi6jeO8qDDQ=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3/go.mod h1:7uX+sVrlOPmrpkfuVSoO9qO0tWc23lVVCIQOL9GM5Qs=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4 h1:saMfBNajjOKVOEcK85w5nqdPnRGjfpN4wl1R3Ky2Acc=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4/go.mod h1:/w06M/gJF0Xez24qRHwEo+83bw51a65y8w+J1FtE5hU=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n@@ -272,8 +272,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=\n-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=\n+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=\n+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=\n golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.22.7\n toolchain go1.23.4\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4\n \tgithub.com/gruntwork-io/terratest v0.48.1\n \tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n@@ -115,7 +115,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.15.1 // indirect\n \tgolang.org/x/crypto v0.31.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n-\tgolang.org/x/net v0.31.0 // indirect\n+\tgolang.org/x/net v0.33.0 // indirect\n \tgolang.org/x/oauth2 v0.24.0 // indirect\n \tgolang.org/x/sys v0.28.0 // indirect\n \tgolang.org/x/term v0.27.0 // indirect\n---\ntest/integration/go.sum\n@@ -1,7 +1,7 @@\n filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=\n filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3 h1:+lqTQyIdgr9XbI/onTPpwDnKR8I+MFKuIi6jeO8qDDQ=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3/go.mod h1:7uX+sVrlOPmrpkfuVSoO9qO0tWc23lVVCIQOL9GM5Qs=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4 h1:saMfBNajjOKVOEcK85w5nqdPnRGjfpN4wl1R3Ky2Acc=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.4/go.mod h1:/w06M/gJF0Xez24qRHwEo+83bw51a65y8w+J1FtE5hU=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n@@ -272,8 +272,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn\n golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=\n golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=\n-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=\n-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=\n+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=\n+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=\n golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=\n golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=\n golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nAdding contributors \n\n---\n\nChoice A:\nCONTRIBUTING.md\n@@ -132,3 +132,4 @@ Run `make docker_test_lint`.\n [shellcheck]: https://www.shellcheck.net/\n [terraform-docs]: https://github.com/segmentio/terraform-docs\n [terraform]: https://terraform.io/\n+Tanikonda Mallikarjuna Rao\n---\n\n\n---\n\nChoice B:\nCONTRIBUTING.md\n@@ -132,3 +132,4 @@ Run `make docker_test_lint`.\n [shellcheck]: https://www.shellcheck.net/\n [terraform-docs]: CONTRIBUTING.md\n@@ [terraform]: https://terraform.io/\n+Tanikonda Mallikarjuna Rao\n---\n\n\n---\n\nChoice C:\nCONTRIBUTING.md\n@@ -132,3 +132,4 @@ Run `make docker_test_lint`.\n [shellcheck]: https://www.shellcheck.net/\n [terraform-docs]: docker_test_lint`.\n [terraform]: https://terraform.io/\n+Tanikonda Mallikarjuna Rao\n---\n\n\n---\n\nChoice D:\nCONTRIBUTING.md\n@@ -132,3 +132,4 @@ Run `make docker_test_lint`.\n [shellcheck]: https://www.shellcheck.net/\n [terraform-docs]: https://github.com/segmentio/terraform-docs\n [terraform]: docker_test_lint`.\n Mallikarjuna Rao\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ncluster.tf\n@@ -833,8 +833,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n lifecycle {\n- ignore_changes = [initial_node_count]\n-\n+ ignore_changes = [initial_node_count, node_config.0.kubelet_config]\n \n timeouts {\n---\n\n\n---\n\nChoice B:\ncluster.tf\n@@ -833,8 +833,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n lifecycle {\n- ignore_changes = [initial_node_count]\n-\n+ ignore_changes cluster.tf\n@@ [initial_node_count, node_config.0.kubelet_config]\n }\n \n timeouts {\n---\n\n\n---\n\nChoice C:\ncluster.tf\n@@ -833,8 +833,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n lifecycle {\n- ignore_changes = [initial_node_count]\n-\n+ ignore_changes = [initial_node_count, node_config.0.kubelet_config]\n }\n \n timeouts {\n---\n\n\n---\n\nChoice D:\ncluster.tf\n@@ -833,8 +833,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n lifecycle {\n- ignore_changes = [initial_node_count]\n-\n+ [initial_node_count, ignore_changes = [initial_node_count, node_config.0.kubelet_config]\n }\n \n timeouts {\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://redirect.github.com/gruntwork-io/terratest) | `v0.48.0` -> `v0.48.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n| [github.com/hashicorp/terraform-json](https://redirect.github.com/hashicorp/terraform-json) | `v0.23.0` -> `v0.24.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.48.1`](https://redirect.github.com/gruntwork-io/terratest/releases/tag/v0.48.1)\n\n[Compare Source](https://redirect.github.com/gruntwork-io/terratest/compare/v0.48.0...v0.48.1)\n\n#### Modules affected\n\n- `helm`\n- `azure`\n- `aws`\n- `k8s`\n\n#### What's Changed\n\n- feat: Adding release instructions in PR by [@​yhakbar](https://redirect.github.com/yhakbar) in [https://github.com/gruntwork-io/terratest/pull/1488](https://redirect.github.com/gruntwork-io/terratest/pull/1488)\n- fix: Fixing the TestRemoteChartRender Unit Test failure by pecifing remote chart version by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1486](https://redirect.github.com/gruntwork-io/terratest/pull/1486)\n- fix: Fix terraform-azure-aks-example unit test failure. by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1489](https://redirect.github.com/gruntwork-io/terratest/pull/1489)\n- chore: add function to retrieve latest version of a policy document by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1490](https://redirect.github.com/gruntwork-io/terratest/pull/1490)\n- fix: honor options.RestConfig in tunnel.ForwardPortE by [@​jduepmeier](https://redirect.github.com/jduepmeier) in [https://github.com/gruntwork-io/terratest/pull/1464](https://redirect.github.com/gruntwork-io/terratest/pull/1464)\n\n#### New Contributors\n\n- [@​jduepmeier](https://redirect.github.com/jduepmeier) made their first contribution in [https://github.com/gruntwork-io/terratest/pull/1464](https://redirect.github.com/gruntwork-io/terratest/pull/1464)\n\n**Full Changelog**: https://github.com/gruntwork-io/terratest/compare/v0.48.0...v0.48.1\n\n</details>\n\n<details>\n<summary>hashicorp/terraform-json (github.com/hashicorp/terraform-json)</summary>\n\n### [`v0.24.0`](https://redirect.github.com/hashicorp/terraform-json/releases/tag/v0.24.0)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-json/compare/v0.23.0...v0.24.0)\n\nENHANCEMENTS:\n\n- Add support for write-only attributes by [@​SarahFrench](https://redirect.github.com/SarahFrench) in [https://github.com/hashicorp/terraform-json/pull/146](https://redirect.github.com/hashicorp/terraform-json/pull/146)\n\nINTERNAL:\n\n- build(deps): Bump workflows to latest trusted versions by [@​hashicorp-tsccr](https://redirect.github.com/hashicorp-tsccr) in [https://github.com/hashicorp/terraform-json/pull/141](https://redirect.github.com/hashicorp/terraform-json/pull/141)\n- Add CONTRIBUTING.md by [@​radeksimko](https://redirect.github.com/radeksimko) in [https://github.com/hashicorp/terraform-json/pull/143](https://redirect.github.com/hashicorp/terraform-json/pull/143)\n- ci: Report test coverage by [@​radeksimko](https://redirect.github.com/radeksimko) in [https://github.com/hashicorp/terraform-json/pull/144](https://redirect.github.com/hashicorp/terraform-json/pull/144)\n- Bump github.com/zclconf/go-cty from 1.15.0 to 1.15.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/hashicorp/terraform-json/pull/145](https://redirect.github.com/hashicorp/terraform-json/pull/145)\n\n#### New Contributors\n\n- [@​SarahFrench](https://redirect.github.com/SarahFrench) made their first contribution in [https://github.com/hashicorp/terraform-json/pull/146](https://redirect.github.com/hashicorp/terraform-json/pull/146)\n\n**Full Changelog**: https://github.com/hashicorp/terraform-json/compare/v0.23.0...v0.24.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👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired.\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS41OC4xIiwidXBkYXRlZEluVmVyIjoiMzkuNzIuNSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -6,11 +6,9 @@ toolchain go1.23.4\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3\n-\tgithub.com/gruntwork-io/terratest v0.48.0\n-\tgithub.com/hashicorp/terraform-json v0.23.0\n-\tgithub.com/itchyny/gojq v0.12.17\n+\tgithub.com/gruntwork-io/terratest v0.48.1\n+\tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n-\tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n@@ -82,7 +80,6 @@ require (\n \tgithub.com/hashicorp/hcl/v2 v2.22.0 // indirect\n \tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 // indirect\n \tgithub.com/imdario/mergo v0.3.16 // indirect\n-\tgithub.com/itchyny/timefmt-go v0.1.6 // indirect\n \tgithub.com/jackc/pgpassfile v1.0.0 // indirect\n \tgithub.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect\n \tgithub.com/jackc/pgx/v5 v5.7.1 // indirect\n@@ -106,14 +103,15 @@ require (\n \tgithub.com/pquerna/otp v1.4.0 // indirect\n \tgithub.com/russross/blackfriday/v2 v2.1.0 // indirect\n \tgithub.com/spf13/pflag v1.0.5 // indirect\n+\tgithub.com/tidwall/gjson v1.18.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n-\tgithub.com/zclconf/go-cty v1.15.0 // indirect\n+\tgithub.com/zclconf/go-cty v1.15.1 // indirect\n \tgolang.org/x/crypto v0.29.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n \tgolang.org/x/net v0.31.0 // indirect\n---\ntest/integration/go.sum\n@@ -134,8 +134,8 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+\n github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.48.0 h1:OoqJYAnBxejInn7TPizFGJNMCFvPHbiWNS3hGFKdHhA=\n-github.com/gruntwork-io/terratest v0.48.0/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=\n+github.com/gruntwork-io/terratest v0.48.1 h1:pnydDjkWbZCUYXvQkr24y21fBo8PfJC5hRGdwbl1eXM=\n+github.com/gruntwork-io/terratest v0.48.1/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n@@ -155,14 +155,10 @@ github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul1\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 h1:146llE+6P/9YO8RcHRehzGNiS9+OoirKW9/aML6/JIA=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n-github.com/hashicorp/terraform-json v0.23.0 h1:sniCkExU4iKtTADReHzACkk8fnpQXrdD2xoR+lppBkI=\n-github.com/hashicorp/terraform-json v0.23.0/go.mod h1:MHdXbBAbSg0GvzuWazEGKAn/cyNfIB7mN6y7KJN6y2c=\n+github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n+github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=\n github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=\n-github.com/itchyny/gojq v0.12.17 h1:8av8eGduDb5+rvEdaOO+zQUjA04MS0m3Ps8HiD+fceg=\n-github.com/itchyny/gojq v0.12.17/go.mod h1:WBrEMkgAfAGO1LUcGOckBl5O726KPp+OlkKug0I/FEY=\n-github.com/itchyny/timefmt-go v0.1.6 h1:ia3s54iciXDdzWzwaVKXZPbiXzxxnv1SPGFfM/myJ5Q=\n-github.com/itchyny/timefmt-go v0.1.6/go.mod h1:RRDZYC5s9ErkjQvTvvU7keJjxUYzIISJGxm9/mAERQg=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=\n github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=\n@@ -259,8 +255,8 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT\n github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=\n github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n-github.com/zclconf/go-cty v1.15.0 h1:tTCRWxsexYUmtt/wVxgDClUe+uQusuI443uL6e+5sXQ=\n-github.com/zclconf/go-cty v1.15.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n+github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0=\n+github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -6,11 +6,9 @@ toolchain go1.23.4\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3\n-\tgithub.com/gruntwork-io/terratest v0.48.0\n-\tgithub.com/hashicorp/terraform-json v0.23.0\n-\tgithub.com/itchyny/gojq v0.12.17\n+\tgithub.com/gruntwork-io/terratest v0.48.1\n+\tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n-\tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n@@ -82,7 +80,6 @@ require (\n \tgithub.com/hashicorp/hcl/v2 v2.22.0 // indirect\n \tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 // indirect\n \tgithub.com/imdario/mergo v0.3.16 // indirect\n-\tgithub.com/itchyny/timefmt-go v0.1.6 // indirect\n \tgithub.com/jackc/pgpassfile v1.0.0 // indirect\n \tgithub.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect\n \tgithub.com/jackc/pgx/v5 v5.7.1 // indirect\n@@ -106,14 +103,15 @@ require \tgithub.com/jackc/pgservicefile \tgithub.com/pquerna/otp v1.4.0 // indirect\n \tgithub.com/russross/blackfriday/v2 v2.1.0 // indirect\n \tgithub.com/spf13/pflag v1.0.5 // indirect\n+\tgithub.com/tidwall/gjson v1.18.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n-\tgithub.com/zclconf/go-cty v1.15.0 // indirect\n+\tgithub.com/zclconf/go-cty v1.15.1 // indirect\n \tgolang.org/x/crypto v0.29.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n \tgolang.org/x/net v0.31.0 // indirect\n---\ntest/integration/go.sum\n@@ -134,8 +134,8 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+\n github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.48.0 h1:OoqJYAnBxejInn7TPizFGJNMCFvPHbiWNS3hGFKdHhA=\n-github.com/gruntwork-io/terratest v0.48.0/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=\n+github.com/gruntwork-io/terratest v0.48.1 h1:pnydDjkWbZCUYXvQkr24y21fBo8PfJC5hRGdwbl1eXM=\n+github.com/gruntwork-io/terratest v0.48.1/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n@@ -155,14 +155,10 @@ github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul1\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 h1:146llE+6P/9YO8RcHRehzGNiS9+OoirKW9/aML6/JIA=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n-github.com/hashicorp/terraform-json v0.23.0 h1:sniCkExU4iKtTADReHzACkk8fnpQXrdD2xoR+lppBkI=\n-github.com/hashicorp/terraform-json v0.23.0/go.mod h1:MHdXbBAbSg0GvzuWazEGKAn/cyNfIB7mN6y7KJN6y2c=\n+github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n+github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=\n github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=\n-github.com/itchyny/gojq v0.12.17 h1:8av8eGduDb5+rvEdaOO+zQUjA04MS0m3Ps8HiD+fceg=\n-github.com/itchyny/gojq v0.12.17/go.mod h1:WBrEMkgAfAGO1LUcGOckBl5O726KPp+OlkKug0I/FEY=\n-github.com/itchyny/timefmt-go v0.1.6 h1:ia3s54iciXDdzWzwaVKXZPbiXzxxnv1SPGFfM/myJ5Q=\n-github.com/itchyny/timefmt-go v0.1.6/go.mod h1:RRDZYC5s9ErkjQvTvvU7keJjxUYzIISJGxm9/mAERQg=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=\n github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=\n@@ -259,8 +255,8 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT\n github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=\n github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n-github.com/zclconf/go-cty v1.15.0 h1:tTCRWxsexYUmtt/wVxgDClUe+uQusuI443uL6e+5sXQ=\n-github.com/zclconf/go-cty v1.15.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n+github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0=\n+github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -6,11 +6,9 @@ toolchain go1.23.4\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3\n-\tgithub.com/gruntwork-io/terratest v0.48.0\n-\tgithub.com/hashicorp/terraform-json v0.23.0\n-\tgithub.com/itchyny/gojq v0.12.17\n+\tgithub.com/gruntwork-io/terratest v0.48.1\n+\tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n-\tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n@@ -82,7 +80,6 @@ require (\n \tgithub.com/hashicorp/hcl/v2 v2.22.0 // indirect\n \tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 // indirect\n \tgithub.com/imdario/mergo v0.3.16 // indirect\n-\tgithub.com/itchyny/timefmt-go v0.1.6 // indirect\n \tgithub.com/jackc/pgpassfile v1.0.0 // indirect\n \tgithub.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect\n \tgithub.com/jackc/pgx/v5 v5.7.1 // indirect\n@@ -106,14 +103,15 @@ require (\n \tgithub.com/pquerna/otp v1.4.0 // indirect\n \tgithub.com/russross/blackfriday/v2 v2.1.0 // indirect\n \tgithub.com/spf13/pflag v1.0.5 // indirect\n+\tgithub.com/tidwall/gjson v1.18.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n-\tgithub.com/zclconf/go-cty h1:pnydDjkWbZCUYXvQkr24y21fBo8PfJC5hRGdwbl1eXM=\n+github.com/gruntwork-io/terratest // indirect\n+\tgithub.com/zclconf/go-cty v1.15.1 // indirect\n \tgolang.org/x/crypto v0.29.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n \tgolang.org/x/net v0.31.0 // indirect\n---\ntest/integration/go.sum\n@@ -134,8 +134,8 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+\n github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.48.0 h1:OoqJYAnBxejInn7TPizFGJNMCFvPHbiWNS3hGFKdHhA=\n-github.com/gruntwork-io/terratest v0.48.0/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=\n+github.com/gruntwork-io/terratest v0.48.1 h1:pnydDjkWbZCUYXvQkr24y21fBo8PfJC5hRGdwbl1eXM=\n+github.com/gruntwork-io/terratest v0.48.1/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n@@ -155,14 +155,10 @@ github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul1\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 h1:146llE+6P/9YO8RcHRehzGNiS9+OoirKW9/aML6/JIA=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n-github.com/hashicorp/terraform-json v0.23.0 h1:sniCkExU4iKtTADReHzACkk8fnpQXrdD2xoR+lppBkI=\n-github.com/hashicorp/terraform-json v0.23.0/go.mod h1:MHdXbBAbSg0GvzuWazEGKAn/cyNfIB7mN6y7KJN6y2c=\n+github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n+github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=\n github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=\n-github.com/itchyny/gojq v0.12.17 h1:8av8eGduDb5+rvEdaOO+zQUjA04MS0m3Ps8HiD+fceg=\n-github.com/itchyny/gojq v0.12.17/go.mod h1:WBrEMkgAfAGO1LUcGOckBl5O726KPp+OlkKug0I/FEY=\n-github.com/itchyny/timefmt-go v0.1.6 h1:ia3s54iciXDdzWzwaVKXZPbiXzxxnv1SPGFfM/myJ5Q=\n-github.com/itchyny/timefmt-go v0.1.6/go.mod h1:RRDZYC5s9ErkjQvTvvU7keJjxUYzIISJGxm9/mAERQg=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=\n github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=\n@@ -259,8 +255,8 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT\n github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=\n github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n-github.com/zclconf/go-cty v1.15.0 h1:tTCRWxsexYUmtt/wVxgDClUe+uQusuI443uL6e+5sXQ=\n-github.com/zclconf/go-cty v1.15.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n+github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0=\n+github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -6,11 +6,9 @@ toolchain go1.23.4\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.3\n-\tgithub.com/gruntwork-io/terratest v0.48.0\n-\tgithub.com/hashicorp/terraform-json h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n v0.12.17\n+\tgithub.com/gruntwork-io/terratest v0.48.1\n+\tgithub.com/hashicorp/terraform-json v0.24.0\n \tgithub.com/stretchr/testify v1.10.0\n-\tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n@@ -82,7 +80,6 @@ require (\n \tgithub.com/hashicorp/hcl/v2 v2.22.0 // indirect\n \tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 // indirect\n \tgithub.com/imdario/mergo v0.3.16 // indirect\n-\tgithub.com/itchyny/timefmt-go v0.1.6 // indirect\n \tgithub.com/jackc/pgpassfile v1.0.0 // indirect\n \tgithub.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect\n \tgithub.com/jackc/pgx/v5 v5.7.1 // indirect\n@@ -106,14 +103,15 @@ require (\n \tgithub.com/pquerna/otp v1.4.0 // indirect\n \tgithub.com/russross/blackfriday/v2 v2.1.0 // indirect\n \tgithub.com/spf13/pflag v1.0.5 // indirect\n+\tgithub.com/tidwall/gjson v1.18.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/urfave/cli/v2 v2.25.7 // indirect\n \tgithub.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect\n-\tgithub.com/zclconf/go-cty v1.15.0 // indirect\n+\tgithub.com/zclconf/go-cty v1.15.1 // indirect\n \tgolang.org/x/crypto v0.29.0 // indirect\n \tgolang.org/x/mod v0.22.0 // indirect\n \tgolang.org/x/net v0.31.0 // indirect\n---\ntest/integration/go.sum\n@@ -134,8 +134,8 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+\n github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.48.0 h1:OoqJYAnBxejInn7TPizFGJNMCFvPHbiWNS3hGFKdHhA=\n-github.com/gruntwork-io/terratest v0.48.0/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=\n+github.com/gruntwork-io/terratest v0.48.1 h1:pnydDjkWbZCUYXvQkr24y21fBo8PfJC5hRGdwbl1eXM=\n+github.com/gruntwork-io/terratest v0.48.1/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n@@ -155,14 +155,10 @@ github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul1\n github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 h1:146llE+6P/9YO8RcHRehzGNiS9+OoirKW9/aML6/JIA=\n github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n-github.com/hashicorp/terraform-json v0.23.0 h1:sniCkExU4iKtTADReHzACkk8fnpQXrdD2xoR+lppBkI=\n-github.com/hashicorp/terraform-json v0.23.0/go.mod h1:MHdXbBAbSg0GvzuWazEGKAn/cyNfIB7mN6y7KJN6y2c=\n+github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=\n+github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=\n github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=\n github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=\n-github.com/itchyny/gojq v0.12.17 h1:8av8eGduDb5+rvEdaOO+zQUjA04MS0m3Ps8HiD+fceg=\n-github.com/itchyny/gojq v0.12.17/go.mod h1:WBrEMkgAfAGO1LUcGOckBl5O726KPp+OlkKug0I/FEY=\n-github.com/itchyny/timefmt-go v0.1.6 h1:ia3s54iciXDdzWzwaVKXZPbiXzxxnv1SPGFfM/myJ5Q=\n-github.com/itchyny/timefmt-go v0.1.6/go.mod h1:RRDZYC5s9ErkjQvTvvU7keJjxUYzIISJGxm9/mAERQg=\n github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=\n github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=\n github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=\n@@ -259,8 +255,8 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT\n github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=\n github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=\n-github.com/zclconf/go-cty v1.15.0 h1:tTCRWxsexYUmtt/wVxgDClUe+uQusuI443uL6e+5sXQ=\n-github.com/zclconf/go-cty v1.15.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n+github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0=\n+github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=\n golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -183,7 +183,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n {% if beta_cluster %}\n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n {% endif %}\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n---\nexamples/simple_regional_cluster_autoscaling/main.tf\n@@ -53,6 +53,7 @@ module \"gke\" {\n cluster_autoscaling = {\n enabled = true\n autoscaling_profile = \"OPTIMIZE_UTILIZATION\"\n+ min_cpu_platform = \"Intel Skylake\"\n min_cpu_cores = 4\n max_cpu_cores = 86\n min_memory_gb = 16\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -183,7 +183,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n {% if beta_cluster %}\n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n {% endif %}\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n---\nexamples/simple_regional_cluster_autoscaling/main.tf\n@@ -53,6 +53,7 @@ module \"gke\" {\n cluster_autoscaling = {\n enabled = true\n autoscaling_profile = \"OPTIMIZE_UTILIZATION\"\n+ min_cpu_platform = \"Intel Skylake\"\n min_cpu_cores = 4\n max_cpu_cores = 86\n min_memory_gb = 16\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -183,7 +183,7 \"image_type\", resource \"google_container_cluster\" \"primary\" {\n }\n \n {% if beta_cluster %}\n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n {% endif %}\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n---\nexamples/simple_regional_cluster_autoscaling/main.tf\n@@ -53,6 +53,7 @@ module \"gke\" {\n cluster_autoscaling = {\n enabled = true\n autoscaling_profile = \"OPTIMIZE_UTILIZATION\"\n+ min_cpu_platform = \"Intel Skylake\"\n min_cpu_cores = 4\n max_cpu_cores = 86\n min_memory_gb = 16\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -183,7 +183,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n {% if beta_cluster %}\n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n {% endif %}\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n---\nexamples/simple_regional_cluster_autoscaling/main.tf\n@@ -53,6 +53,7 @@ module \"gke\" {\n cluster_autoscaling = {\n enabled = true\n autoscaling_profile = \"OPTIMIZE_UTILIZATION\"\n+ min_cpu_platform = \"Intel Skylake\"\n min_cpu_cores = 4\n max_cpu_cores = 86\n min_memory_gb = 16\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -155,7 +155,7 @@ resource \"google_container_cluster\" \"primary\" {\n enable_integrity_monitoring = lookup(var.cluster_autoscaling, \"enable_integrity_monitoring\", true)\n }\n \n- min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n+ min_cpu_platform = lookup(var.cluster_autoscaling, \"min_cpu_platform\", \"\")\n \n image_type = lookup(var.cluster_autoscaling, \"image_type\", \"COS_CONTAINERD\")\n }\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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/network/google](https://registry.terraform.io/modules/terraform-google-modules/network/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-network)) | module | major | `~> 9.3` -> `~> 10.0` |\n| [terraform-google-modules/network/google](https://registry.terraform.io/modules/terraform-google-modules/network/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-network)) | module | major | `~> 9.0` -> `~> 10.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-network (terraform-google-modules/network/google)</summary>\n\n### [`v10.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-network/blob/HEAD/CHANGELOG.md#1000-2024-12-11)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-network/compare/v9.3.0...v10.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- Add network_profile setting to network, update network resource provider ([#​584](https://redirect.github.com/terraform-google-modules/terraform-google-network/issues/584))\n\n##### Features\n\n- Add network_profile setting to network, update network resource provider ([#​584](https://redirect.github.com/terraform-google-modules/terraform-google-network/issues/584)) ([456a6d9](https://redirect.github.com/terraform-google-modules/terraform-google-network/commit/456a6d91235792ab3ee91be05fb01e0f5e515a3c))\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 these updates 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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS41OC4xIiwidXBkYXRlZEluVmVyIjoiMzkuNTguMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nexamples/island_cluster_anywhere_in_gcp_design/network.tf\n@@ -14,7 +14,7 @@\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.0\"\n+ version = \"~> 10.0\"\n \n for_each = { for k, v in var.gke_spokes : k => v }\n \n---\nexamples/island_cluster_with_vm_router/main.tf\n@@ -25,7 +25,7 @@ resource \"google_service_account\" \"gke-sa\" {\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.0\"\n+ version = \"~> 10.0\"\n \n network_name = \"gke-net-${random_id.rand.hex}\"\n routing_mode = = \"GLOBAL\"\n---\nexamples/safer_cluster_iap_bastion/network.tf\n@@ -17,7 +17,7 @@\n \n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.3\"\n+ version = \"~> 10.0\"\n \n project_id = module.enabled_google_apis.project_id\n network_name = var.network_name\n---\n\n\n---\n\nChoice B:\nexamples/island_cluster_anywhere_in_gcp_design/network.tf\n@@ -14,7 +14,7 @@\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.0\"\n+ version = \"~> 10.0\"\n \n for_each = { for k, v in var.gke_spokes : k => v }\n \n---\nexamples/island_cluster_with_vm_router/main.tf\n@@ -25,7 +25,7 @@ resource \"google_service_account\" \"gke-sa\" {\n \n module \"net\" {\n source version \"terraform-google-modules/network/google\"\n- version = \"~> 9.0\"\n+ version = \"~> 10.0\"\n \n network_name = \"gke-net-${random_id.rand.hex}\"\n routing_mode = \"GLOBAL\"\n---\nexamples/safer_cluster_iap_bastion/network.tf\n@@ -17,7 +17,7 @@\n \n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.3\"\n+ version = \"~> 10.0\"\n \n project_id = module.enabled_google_apis.project_id\n network_name = var.network_name\n---\n\n\n---\n\nChoice C:\nexamples/island_cluster_anywhere_in_gcp_design/network.tf\n@@ -14,7 +14,7 @@\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.0\"\n+ version = \"~> 10.0\"\n \n for_each = { for k, v in var.gke_spokes : k => v }\n \n---\nexamples/island_cluster_with_vm_router/main.tf\n@@ -25,7 +25,7 @@ resource \"google_service_account\" \"gke-sa\" {\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.0\"\n+ version = \"~> 10.0\"\n \n network_name = \"gke-net-${random_id.rand.hex}\"\n routing_mode = \"GLOBAL\"\n---\nexamples/safer_cluster_iap_bastion/network.tf\n@@ -17,7 +17,7 @@\n \n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.3\"\n+ version = \"~> 10.0\"\n \n project_id = module.enabled_google_apis.project_id\n network_name = var.network_name\n---\n\n\n---\n\nChoice D:\nexamples/island_cluster_anywhere_in_gcp_design/network.tf\n@@ -14,7 +14,7 @@\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.0\"\n+ version = \"~> 10.0\"\n \n for_each = { for k, v in var.gke_spokes : k => v }\n \n---\nexamples/island_cluster_with_vm_router/main.tf\n@@ -25,7 +25,7 @@ resource \"google_service_account\" \"gke-sa\" {\n \n module \"net\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.0\"\n+ version = \"~> 10.0\"\n \n network_name = \"gke-net-${random_id.rand.hex}\"\n routing_mode = \"GLOBAL\"\n---\nexamples/safer_cluster_iap_bastion/network.tf\n@@ -17,7 +17,7 @@\n \n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.3\"\n+ version = \"~> 10.0\"\n \n project_id = module.enabled_google_apis.project_id\n network_name = var.network_name\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -215,6 +215,9 @@\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n+ \"kubeletConfig\": {\n+ \"insecureKubeletReadonlyPortEnabled\": true\n+ },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n \"node_pool\": \"default-node-pool\"\n---\n\n\n---\n\nChoice B:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -215,6 +215,9 @@\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n+ \"kubeletConfig\": {\n+ \"insecureKubeletReadonlyPortEnabled\": true\n+ },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n \"node_pool\": \"default-node-pool\"\n---\n\n\n---\n\nChoice C:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -215,6 +215,9 @@\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n+ \"kubeletConfig\": {\n+ \"insecureKubeletReadonlyPortEnabled\": true\n+ },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n \"node_pool\": \"default-node-pool\"\n---\n\n\n---\n\nChoice D:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -215,6 +215,9 @@\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n+ \"kubeletConfig\": {\n+ \"insecureKubeletReadonlyPortEnabled\": true\n+ },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n \"node_pool\": \"default-node-pool\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| nginx | kubernetes_pod | patch | `1.27.2` -> `1.27.3` |\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS40Mi40IiwidXBkYXRlZEluVmVyIjoiMzkuNDIuNCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.2\"\n+ image = \"nginx:1.27.3\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice B:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n spec {\n container {\n- image = \"nginx:1.27.2\"\n+ image = \"nginx:1.27.3\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice C:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.2\"\n+ = \"nginx:1.27.3\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice D:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.2\"\n+ image = \"nginx:1.27.3\"\n name = \"nginx-example\"\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 Compute Engine 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| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | toolchain | minor | `1.22.9` -> `1.23.4` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.23.4`](https://redirect.github.com/golang/go/compare/go1.23.3...go1.23.4)\n\n### [`v1.23.3`](https://redirect.github.com/golang/go/compare/go1.23.2...go1.23.3)\n\n### [`v1.23.2`](https://redirect.github.com/golang/go/compare/go1.23.1...go1.23.2)\n\n### [`v1.23.1`](https://redirect.github.com/golang/go/compare/go1.23.0...go1.23.1)\n\n### [`v1.23.0`](https://redirect.github.com/golang/go/compare/go1.22.7...go1.23.0)\n\n### [`v1.22.10`](https://redirect.github.com/golang/go/compare/go1.22.9...go1.22.10)\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS40Mi40IiwidXBkYXRlZEluVmVyIjoiMzkuNDIuNCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -2,14 +2,13 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.22.7\n \n-toolchain go1.22.9\n+toolchain go1.23.4\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/hashicorp/terraform-json v0.23.0\n \tgithub.com/stretchr/testify v1.10.0\n-\tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n@@ -72,6 +71,7 @@ require (\n \tgithub.com/pquerna/otp v1.4.0 // indirect\n \tgithub.com/russross/blackfriday/v2 v2.1.0 // indirect\n \tgithub.com/spf13/pflag v1.0.5 // indirect\n+\tgithub.com/tidwall/gjson v1.18.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -2,14 +2,13 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.22.7\n \n-toolchain go1.22.9\n+toolchain go1.23.4\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/hashicorp/terraform-json v0.23.0\n \tgithub.com/stretchr/testify v1.10.0\n-\tgithub.com/tidwall/gjson v1.18.0\n v1.2.1 \n require (\n@@ -72,6 +71,7 @@ require (\n \tgithub.com/pquerna/otp v1.4.0 // indirect\n \tgithub.com/russross/blackfriday/v2 v2.1.0 // indirect\n \tgithub.com/spf13/pflag v1.0.5 // indirect\n+\tgithub.com/tidwall/gjson v1.18.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -2,14 +2,13 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.22.7\n \n-toolchain go1.22.9\n+toolchain go1.23.4\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/hashicorp/terraform-json v0.23.0\n \tgithub.com/stretchr/testify v1.10.0\n-\tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n@@ -72,6 +71,7 @@ require (\n \tgithub.com/pquerna/otp v1.4.0 // indirect\n \tgithub.com/russross/blackfriday/v2 v2.1.0 // indirect\n \tgithub.com/spf13/pflag test/integration/go.mod\n@@ // indirect\n+\tgithub.com/tidwall/gjson v1.18.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -2,14 +2,13 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.22.7\n \n-toolchain go1.22.9\n+toolchain go1.23.4\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/hashicorp/terraform-json v0.23.0\n \tgithub.com/stretchr/testify v1.10.0\n-\tgithub.com/tidwall/gjson v1.18.0\n )\n \n // (\n@@ -72,6 +71,7 @@ require (\n \tgithub.com/pquerna/otp v1.4.0 // indirect\n \tgithub.com/russross/blackfriday/v2 v2.1.0 // indirect\n \tgithub.com/spf13/pflag v1.0.5 // indirect\n+\tgithub.com/tidwall/gjson v1.18.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Update | Change |\n|---|---|---|\n| cft/developer-tools | minor | `1.22` -> `1.23` |\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS40Mi40IiwidXBkYXRlZEluVmVyIjoiMzkuNDIuNCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nMakefile\n@@ -18,7 +18,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n DOCKER_BIN ?= docker\n---\nbuild/int.cloudbuild.yaml\n@@ -476,6 +476,6 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\n+ machineType: '1.23'\n options:\n machineType: 'N1_HIGHCPU_8'\n---\n\n\n---\n\nChoice B:\nMakefile\n@@ -18,7 +18,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := Make DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n DOCKER_BIN ?= docker\n---\nbuild/int.cloudbuild.yaml\n@@ -476,6 +476,6 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n options:\n machineType: 'N1_HIGHCPU_8'\n---\n\n\n---\n\nChoice C:\nMakefile\n@@ -18,7 +18,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n DOCKER_BIN ?= docker\n---\nbuild/int.cloudbuild.yaml\n@@ -476,6 +476,6 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n options:\n machineType: 'N1_HIGHCPU_8'\n---\n\n\n---\n\nChoice D:\nMakefile\n@@ -18,7 +18,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := of := 1.23\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n DOCKER_BIN ?= docker\n---\nbuild/int.cloudbuild.yaml\n@@ -476,6 +476,6 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'\n options:\n machineType: 'N1_HIGHCPU_8'\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nthis a breaking change as this will cause a recreate of the node pools once more but subsequent updates will be in place\r\n\r\nThis is a huge QOL change to allow rolling out machine type changes without node pool recreate and allowing apps to migrate gracefully\r\n\r\nupstream ref: https://github.com/hashicorp/terraform-provider-google/blob/main/google/services/container/node_config.go#L1937\r\n\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -716,8 +716,6 @@ resource \"google_container_cluster\" \"primary\" {\n {% if update_variant %}\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -730,15 +728,13 @@ locals {\n {% if beta_cluster %}\n \"local_ssd_ephemeral_count\",\n {% endif %}\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\ndocs/upgrading_to_v35.0.md\n@@ -6,3 +6,47 @@ The Terraform Kubernetes Engine Module now requires version 6 of the Google Clou\n \n ### Private Cluster Sub-Modules Endpoint Output\n The private cluster sub-modules now return the cluster's private endpoint for the `endpoint` output when the `enable_private_endpoint` argument is `true`, regardless of the `deploy_using_private_endpoint` argument value.\n+\n+## Update variant random ID keepers updated\n+\n+The v35.0 release updates the keepers for the update variant modules. This will force a recreation of the nodepools.\n+\n+To avoid this, it is possible to edit the remote state of the `random_id` resource to add the new attributes.\n+\n+1. Perform a `terraform plan` as normal, identifying the `random_id` resource(s) changing and the new/removed attributes\n+```tf\n+ ~ keepers = { # forces replacement\n+ - \"disk_type\" = \"\" -> null\n+ - \"disk_size_gb\" = \"\" -> null\n+ - \"machine_type\" = \"\" -> null\n+ - \"enable_gcfs\" = \"\" -> null\n+ # (19 unchanged elements hidden)\n+ }\n+ # (2 unchanged attributes hidden)\n+ }\n+```\n+2. Pull the remote state locally: `terraform state pull > default.tfstate`\n+3. Back up the original remote state: `cp default.tfstate original.tfstate`\n+4. Edit the `random_id` resource(s) to add/remove the attributes from the `terraform plan` step\n+```diff\n+\"attributes\": {\n+ \"b64_std\": \"pool-02-vb4=\",\n+ \"b64_url\": \"pool-02-vb4\",\n+ \"byte_length\": 2,\n+ \"dec\": \"pool-02-48574\",\n+ \"hex\": \"pool-02-bdbe\",\n+ \"id\": \"vb4\",\n+ \"keepers\": {\n+ ...\n+ \"taints\": \"\",\n+- \"disk_size_gb\": \"\",\n+- \"enable_gcfs\": \"\",\n+- \"machine_type\": \"\",\n+- \"disk_type\": \"\",\n+ },\n+ \"prefix\": \"pool-02-\"\n+ }\n+```\n+1. Bump the serial number at the top\n+2. Push the modified state to the remote `terraform state push default.tfstate`\n+3. Confirm the `random_id` resource(s) no longer changes (or the corresponding `nodepool`) in a `terraform plan`\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -610,8 +610,6 @@ resource \"google_container_cluster\" \"primary\" {\n *****************************************/\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -622,15 +620,13 @@ locals {\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n \"local_ssd_ephemeral_count\",\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -589,8 +589,6 @@ resource \"google_container_cluster\" \"primary\" {\n *****************************************/\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -601,15 +599,13 @@ locals {\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n \"local_ssd_ephemeral_count\",\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -563,8 +563,6 @@ resource \"google_container_cluster\" \"primary\" {\n *****************************************/\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -574,15 +572,13 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -716,8 +716,6 @@ resource \"google_container_cluster\" \"primary\" {\n {% if update_variant %}\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -730,15 +728,13 @@ locals {\n {% if beta_cluster %}\n \"local_ssd_ephemeral_count\",\n {% endif %}\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\ndocs/upgrading_to_v35.0.md\n@@ -6,3 +6,47 @@ The Terraform Kubernetes Engine Module now requires version 6 of the Google Clou\n \n ### Private Cluster Sub-Modules Endpoint Output\n The private cluster sub-modules now return the cluster's private endpoint for the `endpoint` output when the `enable_private_endpoint` argument is `true`, regardless of the `deploy_using_private_endpoint` argument value.\n+\n+## Update variant random ID keepers updated\n+\n+The v35.0 release updates the keepers for the update variant modules. This will force a recreation of the nodepools.\n+\n+To avoid this, it is possible to edit the remote state of the `random_id` resource to add the new attributes.\n+\n+1. Perform a `terraform plan` as normal, identifying the `random_id` resource(s) changing and the new/removed attributes\n+```tf\n+ ~ keepers = { # forces replacement\n+ - \"disk_type\" = \"\" -> null\n+ - \"disk_size_gb\" = \"\" -> null\n+ - \"machine_type\" = \"\" -> null\n+ - \"enable_gcfs\" = \"\" -> null\n+ # (19 unchanged elements hidden)\n+ }\n+ # (2 unchanged attributes hidden)\n+ }\n+```\n+2. Pull the remote state locally: `terraform state pull > default.tfstate`\n+3. Back up the original remote state: `cp default.tfstate original.tfstate`\n+4. Edit the `random_id` resource(s) to add/remove the attributes from the `terraform plan` step\n+```diff\n+\"attributes\": {\n+ \"b64_std\": \"pool-02-vb4=\",\n+ \"b64_url\": \"pool-02-vb4\",\n+ \"byte_length\": 2,\n+ \"dec\": \"pool-02-48574\",\n+ \"hex\": \"pool-02-bdbe\",\n+ \"id\": \"vb4\",\n+ \"keepers\": {\n+ ...\n+ \"taints\": \"\",\n+- \"disk_size_gb\": \"\",\n+- \"enable_gcfs\": \"\",\n+- \"machine_type\": \"\",\n+- \"disk_type\": \"\",\n+ },\n+ \"prefix\": \"pool-02-\"\n+ }\n+```\n+1. Bump the serial number at the top\n+2. Push the modified state to the remote `terraform state push default.tfstate`\n+3. Confirm the `random_id` resource(s) no longer changes (or the corresponding `nodepool`) in a `terraform plan`\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -610,8 +610,6 @@ resource \"google_container_cluster\" \"primary\" {\n *****************************************/\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -622,15 +620,13 @@ locals {\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n \"local_ssd_ephemeral_count\",\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -589,8 +589,6 @@ resource \"google_container_cluster\" \"primary\" {\n *****************************************/\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -601,15 +599,13 @@ locals {\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n \"local_ssd_ephemeral_count\",\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -563,8 +563,6 @@ resource \"google_container_cluster\" \"primary\" {\n *****************************************/\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -574,15 +572,13 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -716,8 +716,6 @@ resource \"google_container_cluster\" \"primary\" {\n {% if update_variant %}\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -730,15 +728,13 @@ locals {\n {% if beta_cluster %}\n \"local_ssd_ephemeral_count\",\n {% endif %}\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\ndocs/upgrading_to_v35.0.md\n@@ -6,3 +6,47 @@ The Terraform Kubernetes Engine Module now requires version 6 of the Google Clou\n \n ### Private Cluster Sub-Modules Endpoint Output\n The private cluster sub-modules now return the cluster's private endpoint for the `endpoint` output when the `enable_private_endpoint` argument is `true`, regardless of the `deploy_using_private_endpoint` argument value.\n+\n+## Update variant random ID keepers updated\n+\n+The v35.0 release updates the keepers for the update variant modules. This will force a recreation of the nodepools.\n+\n+To avoid this, it is possible to edit the remote state of the `random_id` resource to add the new attributes.\n+\n+1. Perform a `terraform plan` as normal, identifying the `random_id` resource(s) changing and the new/removed attributes\n+```tf\n+ ~ keepers = { # forces replacement\n+ - \"disk_type\" = \"\" -> null\n+ - \"disk_size_gb\" = \"\" -> null\n+ - \"machine_type\" = \"\" -> null\n+ - \"enable_gcfs\" = \"\" -> null\n+ # (19 unchanged elements hidden)\n+ }\n+ # (2 unchanged attributes hidden)\n+ }\n+```\n+2. Pull the remote state locally: `terraform state pull > default.tfstate`\n+3. Back up the original remote state: `cp default.tfstate original.tfstate`\n+4. Edit the `random_id` resource(s) to add/remove the attributes from the `terraform plan` step\n+```diff\n+\"attributes\": {\n+ \"b64_std\": \"pool-02-vb4=\",\n+ \"b64_url\": \"pool-02-vb4\",\n+ \"byte_length\": 2,\n+ \"dec\": \"pool-02-48574\",\n+ \"hex\": \"pool-02-bdbe\",\n+ \"id\": \"vb4\",\n+ \"keepers\": {\n+ ...\n+ \"taints\": \"\",\n+- \"disk_size_gb\": \"\",\n+- \"enable_gcfs\": \"\",\n+- \"machine_type\": \"\",\n+- \"disk_type\": \"\",\n+ },\n+ \"prefix\": \"pool-02-\"\n+ }\n+```\n+1. Bump the serial number at the top\n+2. Push the modified state to the remote `terraform state push default.tfstate`\n+3. Confirm the `random_id` resource(s) no longer changes (or the corresponding `nodepool`) in a `terraform plan`\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -610,8 +610,6 @@ resource \"google_container_cluster\" \"primary\" {\n *****************************************/\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -622,15 +620,13 @@ locals {\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n \"local_ssd_ephemeral_count\",\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -589,8 +589,6 @@ resource \"google_container_cluster\" \"primary\" {\n *****************************************/\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -601,15 +599,13 @@ locals {\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n \"local_ssd_ephemeral_count\",\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -563,8 +563,6 @@ resource \"google_container_cluster\" \"primary\" {\n *****************************************/\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -574,15 +572,13 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"queued_provisioning\",\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -716,8 +716,6 @@ resource \"google_container_cluster\" \"primary\" {\n {% if update_variant %}\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -730,15 +728,13 @@ locals {\n {% if beta_cluster %}\n \"local_ssd_ephemeral_count\",\n {% endif %}\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\ndocs/upgrading_to_v35.0.md\n@@ -6,3 +6,47 @@ The Terraform Kubernetes Engine Module now requires version 6 of the Google Clou\n \n ### Private Cluster Sub-Modules Endpoint Output\n The private cluster sub-modules now return the cluster's private endpoint for the `endpoint` output when the `enable_private_endpoint` argument is `true`, regardless of the `deploy_using_private_endpoint` argument value.\n+\n+## Update variant random ID keepers updated\n+\n+The v35.0 release updates the keepers for the update variant modules. This will force a recreation of the nodepools.\n+\n+To avoid this, it is possible to edit the remote state of the `random_id` resource to add the new attributes.\n+\n+1. Perform a `terraform plan` as normal, identifying the `random_id` resource(s) changing and the new/removed attributes\n+```tf\n+ ~ keepers = { # forces replacement\n+ - \"disk_type\" = \"\" -> null\n+ - \"disk_size_gb\" = \"\" -> null\n+ - \"machine_type\" = \"\" -> null\n+ - \"enable_gcfs\" = \"\" -> null\n+ # (19 unchanged elements hidden)\n+ }\n+ # (2 unchanged attributes hidden)\n+ }\n+```\n+2. Pull the remote state locally: `terraform state pull > default.tfstate`\n+3. Back up the original remote state: `cp default.tfstate original.tfstate`\n+4. Edit the `random_id` resource(s) to add/remove the attributes from the `terraform plan` step\n+```diff\n+\"attributes\": {\n+ \"b64_std\": \"pool-02-vb4=\",\n+ \"b64_url\": \"pool-02-vb4\",\n+ \"byte_length\": 2,\n+ \"dec\": \"pool-02-48574\",\n+ \"hex\": \"pool-02-bdbe\",\n+ \"id\": \"vb4\",\n+ \"keepers\": {\n+ ...\n+ \"taints\": \"\",\n+- \"disk_size_gb\": \"\",\n+- \"enable_gcfs\": \"\",\n+- \"machine_type\": \"\",\n+- \"disk_type\": \"\",\n+ },\n+ \"prefix\": \"pool-02-\"\n+ }\n+```\n+1. Bump the serial number at the top\n+2. Push the modified state to the remote `terraform state push default.tfstate`\n+3. Confirm the `random_id` resource(s) no longer changes (or the corresponding `nodepool`) in a `terraform plan`\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -610,8 +610,6 @@ resource \"google_container_cluster\" \"primary\" {\n *****************************************/\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -622,15 +620,13 @@ locals {\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n \"local_ssd_ephemeral_count\",\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -589,8 +589,6 @@ resource \"primary\" {\n *****************************************/\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -601,15 +599,13 @@ locals {\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n \"local_ssd_ephemeral_count\",\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -563,8 +563,6 @@ resource \"google_container_cluster\" \"primary\" {\n *****************************************/\n locals {\n force_node_pool_recreation_resources = [\n- \"disk_size_gb\",\n- \"disk_type\",\n \"accelerator_count\",\n \"accelerator_type\",\n \"gpu_partition_size\",\n@@ -574,15 +572,13 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n- \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n \"min_cpu_platform\",\n \"pod_range\",\n \"preemptible\",\n \"spot\",\n \"service_account\",\n- \"enable_gcfs\",\n \"enable_gvnic\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nI would like to add possibility to set enable_private_nodes on nodepool lvl without the need to define a pod_range. \n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -724,7 +724,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n {% if private_cluster %}\n---\ncluster.tf\n@@ -458,7 +458,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n@@ -667,7 +667,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -618,7 +618,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -853,7 +853,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -543,7 +543,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -777,7 +777,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ +599,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n@@ -834,7 +834,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -524,7 +524,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n@@ -758,7 +758,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -552,7 +552,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -762,7 +762,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\nmodules/private-cluster/cluster.tf\n@@ -477,7 +477,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -686,7 +686,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -724,7 +724,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n {% if private_cluster %}\n---\ncluster.tf\n@@ -458,7 +458,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n@@ -667,7 +667,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -618,7 +618,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -853,7 +853,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -543,7 +543,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -777,7 +777,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -599,7 +599,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n = pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n@@ -834,7 +834,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -524,7 +524,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n@@ -758,7 +758,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -552,7 +552,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -762,7 +762,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\nmodules/private-cluster/cluster.tf\n@@ -477,7 +477,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -686,7 +686,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -724,7 +724,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n {% if private_cluster %}\n---\ncluster.tf\n@@ -458,7 +458,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n@@ -667,7 +667,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -618,7 +618,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -853,7 +853,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -543,7 +543,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -777,7 +777,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -599,7 +599,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n@@ -834,7 +834,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -524,7 +524,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n@@ -758,7 +758,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -552,7 +552,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -762,7 +762,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\nmodules/private-cluster/cluster.tf\n@@ -477,7 +477,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -686,7 +686,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -724,7 +724,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n {% if private_cluster %}\n---\ncluster.tf\n@@ -458,7 +458,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n@@ -667,7 +667,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -618,7 +618,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -853,7 +853,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -543,7 +543,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -777,7 +777,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -599,7 +599,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n@@ -834,7 +834,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -524,7 +524,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", null)\n@@ -758,7 +758,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = lookup(network_config.value, \"enable_private_nodes\", : -552,7 +552,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -762,7 +762,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\nmodules/private-cluster/cluster.tf\n@@ -477,7 +477,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n@@ -686,7 +686,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"network_config\" {\n- for_each = length(lookup(each.value, \"pod_range\", \"\")) > 0 ? [each.value] : []\n+ for_each = length(lookup(each.value, \"pod_range\", \"\")) + length(lookup(each.value, \"enable_private_nodes\", \"\")) > 0 ? [each.value] : []\n content {\n pod_range = lookup(network_config.value, \"pod_range\", null)\n enable_private_nodes = var.enable_private_nodes\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | minor | `>= 6.7.0, < 6.11.0` -> `>= 6.7.0, < 6.12.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | minor | `>= 6.8.0, < 6.11.0` -> `>= 6.8.0, < 6.12.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | minor | `>= 6.7.0, < 6.11.0` -> `>= 6.7.0, < 6.12.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | minor | `>= 6.8.0, < 6.11.0` -> `>= 6.8.0, < 6.12.1` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>hashicorp/terraform-provider-google (google)</summary>\n\n### [`v6.12.0`](https://redirect.github.com/hashicorp/terraform-provider-google/blob/HEAD/CHANGELOG.md#6120-November-18-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v6.11.2...v6.12.0)\n\nFEATURES:\n\n- **New Data Source:** `google_access_context_manager_access_policy` ([#​20295](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20295))\n- **New Resource:** `google_dataproc_gdc_spark_application` ([#​20242](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20242))\n- **New Resource:** `google_managed_kafka_cluster` and `google_managed_kafka_topic` ([#​20237](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20237))\n\nIMPROVEMENTS:\n\n- artifactregistry: added `common_repository` field to `google_artifact_registry_repository` resource ([#​20305](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20305))\n- cloudrunv2: added `urls` output field to `google_cloud_run_v2_service` resource ([#​20313](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20313))\n- compute: added `IDPF` as a possible value for the `network_interface.nic_type` field in `google_compute_instance` resource ([#​20250](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20250))\n- compute: added `IDPF` as a possible value for the `guest_os_features.type` field in `google_compute_image` resource ([#​20250](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20250))\n- compute: added `replica_names` field to `sql_database_instance` resource ([#​20202](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20202))\n- filestore: added `performance_config` field to `google_filestore_instance` ([#​20218](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20218))\n- redis: added `persistence_config` to `google_redis_cluster`. ([#​20212](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20212))\n- securesourcemanager: added `workforce_identity_federation_config` field to `google_secure_source_manager_instance` resource ([#​20290](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20290))\n- spanner: added `default_backup_schedule_type` field to `google_spanner_instance` ([#​20213](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20213))\n- sql: added `psc_auto_connections` fields to `google_sql_database_instance` resource ([#​20307](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20307))\n\nBUG FIXES:\n\n- accesscontextmanager: fixed permadiff in perimeter `google_access_context_manager_service_perimeter_ingress_policy` and `google_access_context_manager_service_perimeter_egress_policy` resources when there are duplicate resources in the rules ([#​20294](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20294))\n- - accesscontextmanager: fixed comparison of `identity_type` in `ingress_from` and `egress_from` when the `IDENTITY_TYPE_UNSPECIFIED` is set ([#​20221](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20221))\n- compute: fixed permadiff on attempted `type` field updates in `google_computer_security_policy`, updating this field will now force recreation of the resource ([#​20316](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20316))\n- identityplatform: fixed perma-diff originating from the `sign_in.anonymous.enabled` field in `google_identity_platform_config` ([#​20244](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20244))\n\n### [`v6.11.2`](https://redirect.github.com/hashicorp/terraform-provider-google/blob/HEAD/CHANGELOG.md#6112-November-15-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v6.11.1...v6.11.2)\n\nBUG FIXES:\n\n- vertexai: fixed issue with google_vertex_ai_endpoint where upgrading to 6.11.0 would delete all traffic splits that were set outside Terraform (which was previously a required step for all meaningful use of this resource). ([#​20350](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20350))\n\n### [`v6.11.1`](https://redirect.github.com/hashicorp/terraform-provider-google/blob/HEAD/CHANGELOG.md#6111-November-12-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v6.11.0...v6.11.1)\n\nBUG FIXES:\n\n- container: fixed diff on `google_container_cluster.user_managed_keys_config` field for resources that had not set it. ([#​20314](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20314))\n- container: marked `google_container_cluster.user_managed_keys_config` as immutable because it can't be updated in place. ([#​20314](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20314))\n\n### [`v6.11.0`](https://redirect.github.com/hashicorp/terraform-provider-google/blob/HEAD/CHANGELOG.md#6110-November-11-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v6.10.0...v6.11.0)\n\nNOTES:\n\n- compute: migrated `google_compute_firewall_policy_rule` from DCL engine to MMv1 engine. ([#​20160](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20160))\n\nBREAKING CHANGES:\n\n- looker: made `oauth_config` a required field in `google_looker_instance`, as creating this resource without that field always triggers an API error ([#​20196](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20196))\n\nFEATURES:\n\n- **New Data Source:** `google_spanner_database` ([#​20114](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20114))\n- **New Resource:** `google_apigee_api` ([#​20113](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20113))\n- **New Resource:** `google_dataproc_gdc_application_environment` ([#​20165](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20165))\n- **New Resource:** `google_dataproc_gdc_service_instance` ([#​20147](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20147))\n- **New Resource:** `google_memorystore_instance` ([#​20108](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20108))\n\nIMPROVEMENTS:\n\n- apigee: added in-place update support for `google_apigee_env_references` ([#​20182](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20182))\n- apigee: added in-place update support for `google_apigee_environment` resource ([#​20189](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20189))\n- cloudrun: added `empty_dir` field to `google_cloud_run_service` ([#​20185](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20185))\n- cloudrunv2: added `empty_dir` field to `google_cloud_run_v2_service` and `google_cloud_run_v2_job` ([#​20185](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20185))\n- compute: added `disks` field to `google_compute_node_template` resource ([#​20180](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20180))\n- compute: added `preconfigured_waf_config` field to `google_compute_security_policy` resource ([#​20183](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20183))\n- compute: added `replica_names` field to `sql_database_instance` resource ([#​20202](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20202))\n- compute: added `instance_flexibility_policy` field to `google_compute_region_instance_group_manager` resource ([#​20132](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20132))\n- compute: increased `google_compute_security_policy` timeouts from 20 minutes to 30 minutes ([#​20145](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20145))\n- container: added `control_plane_endpoints_config` field to `google_container_cluster` resource. ([#​20193](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20193))\n- container: added `parallelstore_csi_driver_config` field to `google_container_cluster` resource. ([#​20163](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20163))\n- container: added `user_managed_keys_config` field to `google_container_cluster` resource. ([#​20105](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20105))\n- firestore: allowed single field indexes to support `__name__ DESC` indexes in `google_firestore_index` resources ([#​20124](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20124))\n- privateca: added support for `google_privateca_certificate_authority` with type = \"SUBORDINATE\" to be activated into \"STAGED\" state ([#​20103](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20103))\n- spanner: added `default_backup_schedule_type` field to `google_spanner_instance` ([#​20213](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20213))\n- vertexai: added `traffic_split`, `private_service_connect_config`, `predict_request_response_logging_config`, `dedicated_endpoint_enabled`, and `dedicated_endpoint_dns` fields to `google_vertex_ai_endpoint` resource ([#​20179](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20179))\n- workflows: added `deletion_protection` field to `google_workflows_workflow` resource ([#​20106](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20106))\n\nBUG FIXES:\n\n- compute: fixed a diff based on server-side reordering of `match.src_address_groups` and `match.dest_address_groups` in `google_compute_network_firewall_policy_rule` ([#​20148](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20148))\n- compute: fixed permadiff on the `preconfigured_waf_config` field for `google_compute_security_policy` resource ([#​20183](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20183))\n- container: fixed in-place updates for `node_config.containerd_config` in `google_container_cluster` and `google_container_node_pool` ([#​20112](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20112))\n\n</details>\n\n<details>\n<summary>hashicorp/terraform-provider-google-beta (google-beta)</summary>\n\n### [`v6.12.0`](https://redirect.github.com/hashicorp/terraform-provider-google-beta/blob/HEAD/CHANGELOG.md#6120-November-18-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google-beta/compare/v6.11.2...v6.12.0)\n\nFEATURES:\n\n- **New Data Source:** `google_access_context_manager_access_policy` ([#​8676](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8676))\n- **New Data Source:** `google_backup_dr_data_source` ([#​8641](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8641))\n- **New Resource:** `google_dataproc_gdc_spark_application` ([#​8662](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8662))\n- **New Resource:** `google_iam_folders_policy_binding` ([#​8677](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8677))\n- **New Resource:** `google_iam_organizations_policy_binding` ([#​8679](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8679))\n\nIMPROVEMENTS:\n\n- artifactregistry: added `common_repository` field to `google_artifact_registry_repository` resource ([#​8681](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8681))\n- backupdr: added `access_restriction` field to`google_backup_dr_backup_vault` resource (beta) ([#​8656](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8656))\n- cloudrunv2: added `urls` output field to `google_cloud_run_v2_service` resource ([#​8686](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8686))\n- compute: added `IDPF` as a possible value for the `network_interface.nic_type` field in `google_compute_instance` resource ([#​8664](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8664))\n- compute: added `IDPF` as a possible value for the `guest_os_features.type` field in `google_compute_image` resource ([#​8664](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8664))\n- compute: added `replica_names` field to `sql_database_instance` resource ([#​8637](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8637))\n- filestore: added `performance_config` field to `google_filestore_instance` resource ([#​8647](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8647))\n- redis: added `persistence_config` to `google_redis_cluster`. ([#​8643](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8643))\n- securesourcemanager: added `workforce_identity_federation_config` field to `google_secure_source_manager_instance` resource ([#​8670](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8670))\n- spanner: added `default_backup_schedule_type` field to `google_spanner_instance` ([#​8644](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8644))\n- sql: added `psc_auto_connections` fields to `google_sql_database_instance` resource ([#​8682](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8682))\n\nBUG FIXES:\n\n- accesscontextmanager: fixed permadiff in perimeter `google_access_context_manager_service_perimeter_ingress_policy` and `google_access_context_manager_service_perimeter_egress_policy` resources when there are duplicate resources in the rules ([#​8675](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8675))\n- accesscontextmanager: fixed comparison of `identity_type` in `ingress_from` and `egress_from` when the `IDENTITY_TYPE_UNSPECIFIED` is set ([#​8648](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8648))\n- compute: fixed permadiff on attempted `type` field updates in `google_computer_security_policy`, updating this field will now force recreation of the resource ([#​8689](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8689))\n- identityplatform: fixed perma-diff in `google_identity_platform_config` ([#​8663](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8663))\n\n### [`v6.11.2`](https://redirect.github.com/hashicorp/terraform-provider-google-beta/blob/HEAD/CHANGELOG.md#6112-November-15-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google-beta/compare/v6.11.1...v6.11.2)\n\nBUG FIXES:\n\n- vertexai: fixed issue with google_vertex_ai_endpoint where upgrading to 6.11.0 would delete all traffic splits that were set outside Terraform (which was previously a required step for all meaningful use of this resource). ([#​8708](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8708))\n\n### [`v6.11.1`](https://redirect.github.com/hashicorp/terraform-provider-google-beta/blob/HEAD/CHANGELOG.md#6111-November-12-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google-beta/compare/v6.11.0...v6.11.1)\n\nBUG FIXES:\n\n- container: fixed diff on `google_container_cluster.user_managed_keys_config` field for resources that had not set it. ([#​8687](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8687))\n- container: marked `google_container_cluster.user_managed_keys_config` as immutable because it can't be updated in place. ([#​8687](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8687))\n\n### [`v6.11.0`](https://redirect.github.com/hashicorp/terraform-provider-google-beta/blob/HEAD/CHANGELOG.md#6110-November-11-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google-beta/compare/v6.10.0...v6.11.0)\n\nNOTES:\n\n- compute: migrated `google_compute_firewall_policy_rule` from DCL engine to MMv1 engine. ([#​8604](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8604))\n\nBREAKING CHANGES:\n\n- looker: made `oauth_config` a required field in `google_looker_instance`, as creating this resource without that field always triggers an API error ([#​8633](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8633))\n\nDEPRECATIONS:\n\n- backupdr: deprecated `force_delete` on `google_backup_dr_backup_vault`. Use `ignore_inactive_datasources` instead ([#​8616](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8616))\n\nFEATURES:\n\n- **New Data Source:** `google_backup_dr_backup_plan_association` ([#​8632](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8632))\n- **New Data Source:** `google_backup_dr_backup_plan` ([#​8603](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8603))\n- **New Data Source:** `google_spanner_database` ([#​8568](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8568))\n- **New Resource:** `google_apigee_api` ([#​8567](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8567))\n- **New Resource:** `google_backup_dr_backup_plan_association` ([#​8632](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8632))\n- **New Resource:** `google_backup_dr_backup_plan` ([#​8603](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8603))\n- **New Resource:** `google_compute_region_resize_request` ([#​8588](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8588))\n- **New Resource:** `google_dataproc_gdc_application_environment` ([#​8609](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8609))\n- **New Resource:** `google_dataproc_gdc_service_instance` ([#​8591](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8591))\n- **New Resource:** `google_iam_principal_access_boundary_policy` ([#​8634](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8634))\n- **New Resource:** `google_network_management_vpc_flow_logs_config` ([#​8623](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8623))\n\nIMPROVEMENTS:\n\n- apigee: added in-place update support for `google_apigee_env_references` ([#​8621](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8621))\n- apigee: added in-place update support for `google_apigee_environment` resource ([#​8627](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8627))\n- backupdr: added `ignore_inactive_datasources` and `ignore_backup_plan_references` fields to `google_backup_dr_backup_vault` resource ([#​8616](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8616))\n- bigquery: added `external_catalog_dataset_options` fields to `google_bigquery_dataset` resource ([#​8558](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8558))\n- cloudrunv2: added `gcs.mount_options` to `google_cloud_run_v2_service` and `google_cloud_run_v2_job` ([#​8613](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8613))\n- compute: added `rules` property to `google_compute_region_security_policy` resource ([#​8574](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8574))\n- compute: added `disks` field to `google_compute_node_template` resource ([#​8620](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8620))\n- compute: added `replica_names` field to `sql_database_instance` resource ([#​8637](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8637))\n- compute: added new field `instance_flexibility_policy` to resource `google_compute_region_instance_group_manager` ([#​8581](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8581))\n- compute: increased `google_compute_security_policy` timeouts from 20 minutes to 30 minutes ([#​8589](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8589))\n- container: added `control_plane_endpoints_config` field to `google_container_cluster` resource. ([#​8630](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8630))\n- container: added `parallelstore_csi_driver_config` field to `google_container_cluster` resource. ([#​8607](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8607))\n- container: added `user_managed_keys_config` field to `google_container_cluster` resource. ([#​8562](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8562))\n- firestore: allowed single field indexes to support `__name__ DESC` indexes in `google_firestore_index` resources ([#​8576](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8576))\n- privateca: added support for `google_privateca_certificate_authority` with type = \"SUBORDINATE\" to be activated into \"STAGED\" state ([#​8560](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8560))\n- spanner: added `default_backup_schedule_type` field to `google_spanner_instance` ([#​8644](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8644))\n- vertexai: added `traffic_split`, `private_service_connect_config`, `predict_request_response_logging_config`, `dedicated_endpoint_enabled`, and `dedicated_endpoint_dns` fields to `google_vertex_ai_endpoint` resource ([#​8619](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8619))\n- workflows: added `deletion_protection` field to `google_workflows_workflow` resource ([#​8563](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8563))\n\nBUG FIXES:\n\n- compute: fixed a diff based on server-side reordering of `match.src_address_groups` and `match.dest_address_groups` in `google_compute_network_firewall_policy_rule` ([#​8592](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8592))\n- compute: fixed permadiff on the `preconfigured_waf_config` field for `google_compute_security_policy` resource ([#​8622](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8622))\n- container: fixed in-place updates for `node_config.containerd_config` in `google_container_cluster` and `google_container_node_pool` ([#​8566](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8566))\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 these updates 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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMS41IiwidXBkYXRlZEluVmVyIjoiMzkuMTkuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice B:\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice C:\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice D:\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version +21,11 \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 6.12.1\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nautogen/main/versions.tf.tmpl\n@@ -24,33 +24,33 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n {% elif beta_cluster and autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n {% else %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n {% endif %}\n kubernetes = {\n---\nexamples/simple_regional_beta/main.tf\n@@ -30,26 +30,26 @@ module \"gke\" {\n source = \"terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster\"\n version = \"~> 34.0\"\n \n- project_id = var.project_id\n- name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n- regional = var.regional\n- region = var.region\n- zones = var.zones\n- network = var.network\n- subnetwork = var.subnetwork\n- ip_range_pods = var.ip_range_pods\n- ip_range_services = var.ip_range_services\n- create_service_account = var.compute_engine_service_account == \"create\"\n- service_account = var.compute_engine_service_account\n- dns_cache = var.dns_cache\n- gce_pd_csi_driver = var.gce_pd_csi_driver\n- sandbox_enabled = var.sandbox_enabled\n- remove_default_node_pool = var.remove_default_node_pool\n- node_pools = var.node_pools\n- database_encryption = var.database_encryption\n- enable_binary_authorization = var.enable_binary_authorization\n- enable_pod_security_policy = var.enable_pod_security_policy\n- enable_identity_service = true\n+ project_id = var.project_id\n+ name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n+ regional = var.regional\n+ region = var.region\n+ zones = var.zones\n+ network = var.network\n+ subnetwork = var.subnetwork\n+ ip_range_pods = var.ip_range_pods\n+ ip_range_services = var.ip_range_services\n+ create_service_account = var.compute_engine_service_account == \"create\"\n+ service_account = var.compute_engine_service_account\n+ dns_cache = var.dns_cache\n+ gce_pd_csi_driver = var.gce_pd_csi_driver\n+ sandbox_enabled = var.sandbox_enabled\n+ remove_default_node_pool = var.remove_default_node_pool\n+ node_pools = var.node_pools\n+ database_encryption = var.database_encryption\n+ enable_binary_authorization = var.enable_binary_authorization\n+ enable_pod_security_policy = var.enable_pod_security_policy\n+ // enable_identity_service = true TODO: b/378974729\n release_channel = \"REGULAR\"\n logging_enabled_components = [\"SYSTEM_COMPONENTS\"]\n monitoring_enabled_components = [\"SYSTEM_COMPONENTS\"]\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\ntest/integration/beta_cluster/beta_cluster_test.go\n@@ -54,7 +54,7 @@ func TestBetaCluster(t *testing.T) {\n \t\t\t\"privateClusterConfig.enablePrivateEndpoint\",\n \t\t\t\"networkConfig.datapathProvider\",\n \t\t\t\"databaseEncryption.state\",\n-\t\t\t\"identityServiceConfig.enabled\",\n+\t\t\t// \"identityServiceConfig.enabled\", TODO: b/378974729\n \t\t\t\"addonsConfig\",\n \t\t\t\"networkConfig.datapathProvider\",\n \t\t\t\"binaryAuthorization\",\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice B:\nautogen/main/versions.tf.tmpl\n@@ -24,33 +24,33 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n {% elif beta_cluster and autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n {% else %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n {% endif %}\n kubernetes = {\n---\nexamples/simple_regional_beta/main.tf\n@@ -30,26 +30,26 @@ module \"gke\" {\n source = \"terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster\"\n version = \"~> 34.0\"\n \n- project_id = var.project_id\n- name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n- regional = var.regional\n- region = var.region\n- zones = var.zones\n- network = var.network\n- subnetwork = var.subnetwork\n- ip_range_pods = var.ip_range_pods\n- ip_range_services = var.ip_range_services\n- create_service_account = var.compute_engine_service_account == \"create\"\n- service_account = var.compute_engine_service_account\n- dns_cache = var.dns_cache\n- gce_pd_csi_driver = var.gce_pd_csi_driver\n- sandbox_enabled = var.sandbox_enabled\n- remove_default_node_pool = var.remove_default_node_pool\n- node_pools = var.node_pools\n- database_encryption = var.database_encryption\n- enable_binary_authorization = var.enable_binary_authorization\n- enable_pod_security_policy = var.enable_pod_security_policy\n- enable_identity_service = true\n+ project_id = var.project_id\n+ name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n+ regional = var.regional\n+ region = var.region\n+ zones = var.zones\n+ network = var.network\n+ subnetwork = var.subnetwork\n+ ip_range_pods = var.ip_range_pods\n+ ip_range_services = var.ip_range_services\n+ create_service_account = var.compute_engine_service_account == \"create\"\n+ service_account = var.compute_engine_service_account\n+ dns_cache = var.dns_cache\n+ gce_pd_csi_driver = var.gce_pd_csi_driver\n+ sandbox_enabled = var.sandbox_enabled\n+ remove_default_node_pool = var.remove_default_node_pool\n+ node_pools = var.node_pools\n+ database_encryption = var.database_encryption\n+ enable_binary_authorization = var.enable_binary_authorization\n+ enable_pod_security_policy = var.enable_pod_security_policy\n+ // enable_identity_service = true TODO: b/378974729\n release_channel = \"REGULAR\"\n logging_enabled_components = [\"SYSTEM_COMPONENTS\"]\n monitoring_enabled_components = [\"SYSTEM_COMPONENTS\"]\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\ntest/integration/beta_cluster/beta_cluster_test.go\n@@ -54,7 +54,7 @@ func TestBetaCluster(t *testing.T) {\n \t\t\t\"privateClusterConfig.enablePrivateEndpoint\",\n \t\t\t\"networkConfig.datapathProvider\",\n \t\t\t\"databaseEncryption.state\",\n-\t\t\t\"identityServiceConfig.enabled\",\n+\t\t\t// \"identityServiceConfig.enabled\", TODO: b/378974729\n \t\t\t\"addonsConfig\",\n \t\t\t\"networkConfig.datapathProvider\",\n \t\t\t\"binaryAuthorization\",\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice C:\nautogen/main/versions.tf.tmpl\n@@ -24,33 +24,33 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n {% elif beta_cluster and autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n {% else %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n {% endif %}\n kubernetes = {\n---\nexamples/simple_regional_beta/main.tf\n@@ -30,26 +30,26 @@ module \"gke\" {\n source = \"terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster\"\n version = \"~> 34.0\"\n \n- project_id = var.project_id\n- name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n- regional = var.regional\n- region = var.region\n- zones {\n = var.zones\n- network = var.network\n- subnetwork = var.subnetwork\n- ip_range_pods = var.ip_range_pods\n- ip_range_services = var.ip_range_services\n- create_service_account = var.compute_engine_service_account == \"create\"\n- service_account = var.compute_engine_service_account\n- dns_cache = var.dns_cache\n- gce_pd_csi_driver = var.gce_pd_csi_driver\n- sandbox_enabled = var.sandbox_enabled\n- remove_default_node_pool = var.remove_default_node_pool\n- node_pools = var.node_pools\n- database_encryption = var.database_encryption\n- enable_binary_authorization = var.enable_binary_authorization\n- enable_pod_security_policy = var.enable_pod_security_policy\n- enable_identity_service = true\n+ project_id = var.project_id\n+ name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n+ regional = var.regional\n+ region = var.region\n+ zones = var.zones\n+ network = var.network\n+ subnetwork = var.subnetwork\n+ ip_range_pods = var.ip_range_pods\n+ ip_range_services = var.ip_range_services\n+ create_service_account = var.compute_engine_service_account == \"create\"\n+ service_account = var.compute_engine_service_account\n+ dns_cache = var.dns_cache\n+ gce_pd_csi_driver = var.gce_pd_csi_driver\n+ sandbox_enabled = var.sandbox_enabled\n+ remove_default_node_pool = var.remove_default_node_pool\n+ node_pools = var.node_pools\n+ database_encryption = var.database_encryption\n+ enable_binary_authorization = var.enable_binary_authorization\n+ enable_pod_security_policy = var.enable_pod_security_policy\n+ // enable_identity_service = true TODO: b/378974729\n release_channel = \"REGULAR\"\n logging_enabled_components = [\"SYSTEM_COMPONENTS\"]\n monitoring_enabled_components = [\"SYSTEM_COMPONENTS\"]\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\ntest/integration/beta_cluster/beta_cluster_test.go\n@@ -54,7 +54,7 @@ func TestBetaCluster(t *testing.T) {\n \t\t\t\"privateClusterConfig.enablePrivateEndpoint\",\n \t\t\t\"networkConfig.datapathProvider\",\n \t\t\t\"databaseEncryption.state\",\n-\t\t\t\"identityServiceConfig.enabled\",\n+\t\t\t// \"identityServiceConfig.enabled\", TODO: b/378974729\n \t\t\t\"addonsConfig\",\n \t\t\t\"networkConfig.datapathProvider\",\n \t\t\t\"binaryAuthorization\",\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice D:\nautogen/main/versions.tf.tmpl\n@@ -24,33 +24,33 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n {% elif beta_cluster and autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n {% else %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n {% endif %}\n kubernetes = {\n---\nexamples/simple_regional_beta/main.tf\n@@ -30,26 +30,26 @@ module \"gke\" {\n source = \"terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster\"\n version = \"~> 34.0\"\n \n- project_id = var.project_id\n- name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n- regional = var.regional\n- region = var.region\n- zones = var.zones\n- network = var.network\n- subnetwork = var.subnetwork\n- ip_range_pods = var.ip_range_pods\n- ip_range_services = var.ip_range_services\n- create_service_account = var.compute_engine_service_account == \"create\"\n- service_account = var.compute_engine_service_account\n- dns_cache = var.dns_cache\n- gce_pd_csi_driver = var.gce_pd_csi_driver\n- sandbox_enabled = var.sandbox_enabled\n- remove_default_node_pool = var.remove_default_node_pool\n- node_pools = var.node_pools\n- database_encryption = var.database_encryption\n- enable_binary_authorization = var.enable_binary_authorization\n- enable_pod_security_policy = var.enable_pod_security_policy\n- enable_identity_service = true\n+ project_id = var.project_id\n+ name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n+ regional = var.regional\n+ region = var.region\n+ zones = var.zones\n+ network = var.network\n+ subnetwork = var.subnetwork\n+ ip_range_pods = var.ip_range_pods\n+ ip_range_services = var.ip_range_services\n+ create_service_account = var.compute_engine_service_account == \"create\"\n+ service_account = var.compute_engine_service_account\n+ dns_cache = var.dns_cache\n+ gce_pd_csi_driver = var.gce_pd_csi_driver\n+ sandbox_enabled = var.sandbox_enabled\n+ remove_default_node_pool = var.remove_default_node_pool\n+ node_pools = var.node_pools\n+ database_encryption = var.database_encryption\n+ enable_binary_authorization = var.enable_binary_authorization\n+ enable_pod_security_policy = var.enable_pod_security_policy\n+ // enable_identity_service = true TODO: b/378974729\n release_channel = \"REGULAR\"\n logging_enabled_components = [\"SYSTEM_COMPONENTS\"]\n monitoring_enabled_components = [\"SYSTEM_COMPONENTS\"]\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.8.0, < 6.11.0\"\n+ version = \">= 6.8.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\ntest/integration/beta_cluster/beta_cluster_test.go\n@@ -54,7 +54,7 @@ func TestBetaCluster(t *testing.T) {\n \t\t\t\"privateClusterConfig.enablePrivateEndpoint\",\n \t\t\t\"networkConfig.datapathProvider\",\n \t\t\t\"databaseEncryption.state\",\n-\t\t\t\"identityServiceConfig.enabled\",\n+\t\t\t// \"identityServiceConfig.enabled\", TODO: b/378974729\n \t\t\t\"addonsConfig\",\n \t\t\t\"networkConfig.datapathProvider\",\n \t\t\t\"binaryAuthorization\",\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.11.0\"\n+ version = \">= 6.7.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nTo avoid the following error\r\n\r\n```\r\n[...].module.gke.google_container_cluster.primary: Creating...\r\n╷\r\n│ Error: googleapi: Error 400: Failed precondition: Constraint `constraints/gcp.restrictNonCmekServices` violated for `projects/427955863992` attempting to create a resource without specifying a KMS CryptoKey.\r\n│ Details:\r\n│ [\r\n│ {\r\n│ \"@type\": \"[type.googleapis.com/google.rpc.RequestInfo](http://type.googleapis.com/google.rpc.RequestInfo)\",\r\n│ \"requestId\": \"0x49b9d3b73e2c5556\"\r\n│ }\r\n│ ]\r\n│ , failedPrecondition\r\n│\r\n│ with module.environment_cluster.module.cluster.module.gke.google_container_cluster.primary,\r\n│ on .terraform/modules/environment_cluster.cluster.gke/cluster.tf line 22, in resource \"google_container_cluster\" \"primary\":\r\n│ 22: resource \"google_container_cluster\" \"primary\" {\r\n│\r\n```\r\n\r\nUnfortunately cannot have enough rights to properly test end to end \n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -511,6 +511,9 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ {% if not beta_cluster %}\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n+ {% endif %}\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\ncluster.tf\n@@ -388,6 +388,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -388,6 +388,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\nmodules/private-cluster/cluster.tf\n@@ -388,6 +388,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -511,6 +511,9 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ {% if not beta_cluster %}\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n+ {% endif %}\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n \"primary\" machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\ncluster.tf\n@@ -388,6 +388,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -388,6 +388,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\nmodules/private-cluster/cluster.tf\n@@ -388,6 +388,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -511,6 +511,9 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ {% if not beta_cluster %}\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n+ {% endif %}\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"\")\n---\ncluster.tf\n@@ -388,6 +388,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -388,6 +388,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\nmodules/private-cluster/cluster.tf\n@@ -388,6 +388,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -511,6 +511,9 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ {% if not beta_cluster %}\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n+ {% endif %}\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\ncluster.tf\n@@ -388,6 +388,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -388,6 +388,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ boot_disk_kms_key = \"boot_disk_kms_key\", var.boot_disk_kms_key)\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\nmodules/private-cluster/cluster.tf\n@@ -388,6 +388,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n node_config {\n+ boot_disk_kms_key = lookup(var.node_pools[0], \"boot_disk_kms_key\", var.boot_disk_kms_key)\n image_type = lookup(var.node_pools[0], \"image_type\", \"COS_CONTAINERD\")\n machine_type = lookup(var.node_pools[0], \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [github.com/stretchr/testify](https://redirect.github.com/stretchr/testify) | `v1.9.0` -> `v1.10.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>stretchr/testify (github.com/stretchr/testify)</summary>\n\n### [`v1.10.0`](https://redirect.github.com/stretchr/testify/releases/tag/v1.10.0)\n\n[Compare Source](https://redirect.github.com/stretchr/testify/compare/v1.9.0...v1.10.0)\n\n#### What's Changed\n\n##### Functional Changes\n\n- Add PanicAssertionFunc by [@​fahimbagar](https://redirect.github.com/fahimbagar) in [https://github.com/stretchr/testify/pull/1337](https://redirect.github.com/stretchr/testify/pull/1337)\n- assert: deprecate CompareType by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1566](https://redirect.github.com/stretchr/testify/pull/1566)\n- assert: make YAML dependency pluggable via build tags by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1579](https://redirect.github.com/stretchr/testify/pull/1579)\n- assert: new assertion NotElementsMatch by [@​hendrywiranto](https://redirect.github.com/hendrywiranto) in [https://github.com/stretchr/testify/pull/1600](https://redirect.github.com/stretchr/testify/pull/1600)\n- mock: in order mock calls by [@​ReyOrtiz](https://redirect.github.com/ReyOrtiz) in [https://github.com/stretchr/testify/pull/1637](https://redirect.github.com/stretchr/testify/pull/1637)\n- Add assertion for NotErrorAs by [@​palsivertsen](https://redirect.github.com/palsivertsen) in [https://github.com/stretchr/testify/pull/1129](https://redirect.github.com/stretchr/testify/pull/1129)\n- Record Return Arguments of a Call by [@​jayd3e](https://redirect.github.com/jayd3e) in [https://github.com/stretchr/testify/pull/1636](https://redirect.github.com/stretchr/testify/pull/1636)\n- assert.EqualExportedValues: accepts everything by [@​redachl](https://redirect.github.com/redachl) in [https://github.com/stretchr/testify/pull/1586](https://redirect.github.com/stretchr/testify/pull/1586)\n\n##### Fixes\n\n- assert: make tHelper a type alias by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1562](https://redirect.github.com/stretchr/testify/pull/1562)\n- Do not get argument again unnecessarily in Arguments.Error() by [@​TomWright](https://redirect.github.com/TomWright) in [https://github.com/stretchr/testify/pull/820](https://redirect.github.com/stretchr/testify/pull/820)\n- Fix time.Time compare by [@​myxo](https://redirect.github.com/myxo) in [https://github.com/stretchr/testify/pull/1582](https://redirect.github.com/stretchr/testify/pull/1582)\n- assert.Regexp: handle \\[]byte array properly by [@​kevinburkesegment](https://redirect.github.com/kevinburkesegment) in [https://github.com/stretchr/testify/pull/1587](https://redirect.github.com/stretchr/testify/pull/1587)\n- assert: collect.FailNow() should not panic by [@​marshall-lee](https://redirect.github.com/marshall-lee) in [https://github.com/stretchr/testify/pull/1481](https://redirect.github.com/stretchr/testify/pull/1481)\n- mock: simplify implementation of FunctionalOptions by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1571](https://redirect.github.com/stretchr/testify/pull/1571)\n- mock: caller information for unexpected method call by [@​spirin](https://redirect.github.com/spirin) in [https://github.com/stretchr/testify/pull/1644](https://redirect.github.com/stretchr/testify/pull/1644)\n- suite: fix test failures by [@​stevenh](https://redirect.github.com/stevenh) in [https://github.com/stretchr/testify/pull/1421](https://redirect.github.com/stretchr/testify/pull/1421)\n- Fix issue [#​1662](https://redirect.github.com/stretchr/testify/issues/1662) (comparing infs should fail) by [@​ybrustin](https://redirect.github.com/ybrustin) in [https://github.com/stretchr/testify/pull/1663](https://redirect.github.com/stretchr/testify/pull/1663)\n- NotSame should fail if args are not pointers [#​1661](https://redirect.github.com/stretchr/testify/issues/1661) by [@​sikehish](https://redirect.github.com/sikehish) in [https://github.com/stretchr/testify/pull/1664](https://redirect.github.com/stretchr/testify/pull/1664)\n- Increase timeouts in Test_Mock_Called_blocks to reduce flakiness in CI by [@​sikehish](https://redirect.github.com/sikehish) in [https://github.com/stretchr/testify/pull/1667](https://redirect.github.com/stretchr/testify/pull/1667)\n- fix: compare functional option names for indirect calls by [@​arjun-1](https://redirect.github.com/arjun-1) in [https://github.com/stretchr/testify/pull/1626](https://redirect.github.com/stretchr/testify/pull/1626)\n\n##### Documantation, Build & CI\n\n- .gitignore: ignore \"go test -c\" binaries by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1565](https://redirect.github.com/stretchr/testify/pull/1565)\n- mock: improve doc by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1570](https://redirect.github.com/stretchr/testify/pull/1570)\n- mock: fix FunctionalOptions docs by [@​snirye](https://redirect.github.com/snirye) in [https://github.com/stretchr/testify/pull/1433](https://redirect.github.com/stretchr/testify/pull/1433)\n- README: link out to the excellent testifylint by [@​brackendawson](https://redirect.github.com/brackendawson) in [https://github.com/stretchr/testify/pull/1568](https://redirect.github.com/stretchr/testify/pull/1568)\n- assert: fix typo in comment by [@​JohnEndson](https://redirect.github.com/JohnEndson) in [https://github.com/stretchr/testify/pull/1580](https://redirect.github.com/stretchr/testify/pull/1580)\n- Correct the EventuallyWithT and EventuallyWithTf example by [@​JonCrowther](https://redirect.github.com/JonCrowther) in [https://github.com/stretchr/testify/pull/1588](https://redirect.github.com/stretchr/testify/pull/1588)\n- CI: bump softprops/action-gh-release from 1 to 2 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/stretchr/testify/pull/1575](https://redirect.github.com/stretchr/testify/pull/1575)\n- mock: document more alternatives to deprecated AnythingOfTypeArgument by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1569](https://redirect.github.com/stretchr/testify/pull/1569)\n- assert: Correctly document EqualValues behavior by [@​brackendawson](https://redirect.github.com/brackendawson) in [https://github.com/stretchr/testify/pull/1593](https://redirect.github.com/stretchr/testify/pull/1593)\n- fix: grammar in godoc by [@​miparnisari](https://redirect.github.com/miparnisari) in [https://github.com/stretchr/testify/pull/1607](https://redirect.github.com/stretchr/testify/pull/1607)\n- .github/workflows: Run tests for Go 1.22 by [@​HaraldNordgren](https://redirect.github.com/HaraldNordgren) in [https://github.com/stretchr/testify/pull/1629](https://redirect.github.com/stretchr/testify/pull/1629)\n- Document suite's lack of support for t.Parallel by [@​brackendawson](https://redirect.github.com/brackendawson) in [https://github.com/stretchr/testify/pull/1645](https://redirect.github.com/stretchr/testify/pull/1645)\n- assert: fix typos in comments by [@​alexandear](https://redirect.github.com/alexandear) in [https://github.com/stretchr/testify/pull/1650](https://redirect.github.com/stretchr/testify/pull/1650)\n- mock: fix doc comment for NotBefore by [@​alexandear](https://redirect.github.com/alexandear) in [https://github.com/stretchr/testify/pull/1651](https://redirect.github.com/stretchr/testify/pull/1651)\n- Generate better comments for require package by [@​Neokil](https://redirect.github.com/Neokil) in [https://github.com/stretchr/testify/pull/1610](https://redirect.github.com/stretchr/testify/pull/1610)\n- README: replace Testify V2 notice with [@​dolmen](https://redirect.github.com/dolmen)'s V2 manifesto by [@​hendrywiranto](https://redirect.github.com/hendrywiranto) in [https://github.com/stretchr/testify/pull/1518](https://redirect.github.com/stretchr/testify/pull/1518)\n\n#### New Contributors\n\n- [@​fahimbagar](https://redirect.github.com/fahimbagar) made their first contribution in [https://github.com/stretchr/testify/pull/1337](https://redirect.github.com/stretchr/testify/pull/1337)\n- [@​TomWright](https://redirect.github.com/TomWright) made their first contribution in [https://github.com/stretchr/testify/pull/820](https://redirect.github.com/stretchr/testify/pull/820)\n- [@​snirye](https://redirect.github.com/snirye) made their first contribution in [https://github.com/stretchr/testify/pull/1433](https://redirect.github.com/stretchr/testify/pull/1433)\n- [@​myxo](https://redirect.github.com/myxo) made their first contribution in [https://github.com/stretchr/testify/pull/1582](https://redirect.github.com/stretchr/testify/pull/1582)\n- [@​JohnEndson](https://redirect.github.com/JohnEndson) made their first contribution in [https://github.com/stretchr/testify/pull/1580](https://redirect.github.com/stretchr/testify/pull/1580)\n- [@​JonCrowther](https://redirect.github.com/JonCrowther) made their first contribution in [https://github.com/stretchr/testify/pull/1588](https://redirect.github.com/stretchr/testify/pull/1588)\n- [@​miparnisari](https://redirect.github.com/miparnisari) made their first contribution in [https://github.com/stretchr/testify/pull/1607](https://redirect.github.com/stretchr/testify/pull/1607)\n- [@​marshall-lee](https://redirect.github.com/marshall-lee) made their first contribution in [https://github.com/stretchr/testify/pull/1481](https://redirect.github.com/stretchr/testify/pull/1481)\n- [@​spirin](https://redirect.github.com/spirin) made their first contribution in [https://github.com/stretchr/testify/pull/1644](https://redirect.github.com/stretchr/testify/pull/1644)\n- [@​ReyOrtiz](https://redirect.github.com/ReyOrtiz) made their first contribution in [https://github.com/stretchr/testify/pull/1637](https://redirect.github.com/stretchr/testify/pull/1637)\n- [@​stevenh](https://redirect.github.com/stevenh) made their first contribution in [https://github.com/stretchr/testify/pull/1421](https://redirect.github.com/stretchr/testify/pull/1421)\n- [@​jayd3e](https://redirect.github.com/jayd3e) made their first contribution in [https://github.com/stretchr/testify/pull/1636](https://redirect.github.com/stretchr/testify/pull/1636)\n- [@​Neokil](https://redirect.github.com/Neokil) made their first contribution in [https://github.com/stretchr/testify/pull/1610](https://redirect.github.com/stretchr/testify/pull/1610)\n- [@​redachl](https://redirect.github.com/redachl) made their first contribution in [https://github.com/stretchr/testify/pull/1586](https://redirect.github.com/stretchr/testify/pull/1586)\n- [@​ybrustin](https://redirect.github.com/ybrustin) made their first contribution in [https://github.com/stretchr/testify/pull/1663](https://redirect.github.com/stretchr/testify/pull/1663)\n- [@​sikehish](https://redirect.github.com/sikehish) made their first contribution in [https://github.com/stretchr/testify/pull/1664](https://redirect.github.com/stretchr/testify/pull/1664)\n- [@​arjun-1](https://redirect.github.com/arjun-1) made their first contribution in [https://github.com/stretchr/testify/pull/1626](https://redirect.github.com/stretchr/testify/pull/1626)\n\n**Full Changelog**: https://github.com/stretchr/testify/compare/v1.9.0...v1.10.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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xOS4wIiwidXBkYXRlZEluVmVyIjoiMzkuMTkuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -8,7 +8,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/hashicorp/terraform-json v0.23.0\n-\tgithub.com/stretchr/testify v1.9.0\n+\tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n---\ntest/integration/go.sum\n@@ -487,8 +487,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=\n+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson test/integration/go.mod\n@@ h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -8,7 +8,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/hashicorp/terraform-json v0.23.0\n-\tgithub.com/stretchr/testify v1.9.0\n+\tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n-github.com/stretchr/testify \n---\ntest/integration/go.sum\n@@ -487,8 +487,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=\n+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -8,7 +8,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/hashicorp/terraform-json v0.23.0\n-\tgithub.com/stretchr/testify v1.9.0\n+\tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n---\ntest/integration/go.sum\n@@ -487,8 +487,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=\n+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -8,7 +8,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/hashicorp/terraform-json v0.23.0\n-\tgithub.com/stretchr/testify v1.9.0\n+\tgithub.com/stretchr/testify v1.10.0\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n---\ntest/integration/go.sum\n@@ -487,8 +487,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify github.com/stretchr/testify h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=\n+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://redirect.github.com/GoogleCloudPlatform/cloud-foundation-toolkit) | `v0.16.3` -> `v0.17.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xOS4wIiwidXBkYXRlZEluVmVyIjoiMzkuMTkuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.22.7\n toolchain go1.22.9\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/hashicorp/terraform-json v0.23.0\n \tgithub.com/stretchr/testify v1.9.0\n@@ -52,7 +52,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.7.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.20.1 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2 // indirect\n \tgithub.com/imdario/mergo v0.3.16 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n \tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n@@ -82,7 +82,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.15.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.21.0 // indirect\n-\tgolang.org/x/mod v0.21.0 // indirect\n+\tgolang.org/x/mod v0.22.0 // indirect\n \tgolang.org/x/net v0.23.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.4.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3 h1:LKouXohMqxE7u43gOHx57Zme/E3sgMpFq0yPArI4DiE=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3/go.mod h1:6HwC1k0Nr7cu1ZaMeIQjb+sQAHKSHhG5tytYoA8Sn6A=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0 h1:EcxvASC45eOFrkk+cw9vP8Wztms3ZMWAQyBNEaI5MdU=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0/go.mod h1:homk/qeh6p4f7onHkLc5Vy8nG31ZmDK2pamBdHrc1OM=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n@@ -400,8 +400,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc=\n github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 h1:RwY5HBgtBZ997UtKJAO2Rx+94ETyevwWEVXWx1SL5YY=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2 h1:h+wcDC5wTiM+5YKjuLtUSWJtdtMVJNCRCPHoWieLpM4=\n+github.com/hashicorp/terraform-config-inspect v0.17.0 h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.23.0 h1:sniCkExU4iKtTADReHzACkk8fnpQXrdD2xoR+lppBkI=\n github.com/hashicorp/terraform-json v0.23.0/go.mod h1:MHdXbBAbSg0GvzuWazEGKAn/cyNfIB7mN6y7KJN6y2c=\n github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=\n@@ -572,8 +572,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=\n-golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.22.7\n toolchain go1.22.9\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/hashicorp/terraform-json v0.23.0\n \tgithub.com/stretchr/testify v1.9.0\n@@ -52,7 +52,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.7.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.20.1 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2 // indirect\n \tgithub.com/imdario/mergo v0.3.16 // indirect\n \tgithub.com/jinzhu/copier +5,7 // indirect\n \tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n@@ -82,7 +82,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.15.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.21.0 // indirect\n-\tgolang.org/x/mod v0.21.0 // indirect\n+\tgolang.org/x/mod v0.22.0 // indirect\n \tgolang.org/x/net v0.23.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.4.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3 h1:LKouXohMqxE7u43gOHx57Zme/E3sgMpFq0yPArI4DiE=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3/go.mod h1:6HwC1k0Nr7cu1ZaMeIQjb+sQAHKSHhG5tytYoA8Sn6A=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0 h1:EcxvASC45eOFrkk+cw9vP8Wztms3ZMWAQyBNEaI5MdU=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0/go.mod h1:homk/qeh6p4f7onHkLc5Vy8nG31ZmDK2pamBdHrc1OM=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n@@ -400,8 +400,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc=\n github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 h1:RwY5HBgtBZ997UtKJAO2Rx+94ETyevwWEVXWx1SL5YY=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2 h1:h+wcDC5wTiM+5YKjuLtUSWJtdtMVJNCRCPHoWieLpM4=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.23.0 h1:sniCkExU4iKtTADReHzACkk8fnpQXrdD2xoR+lppBkI=\n github.com/hashicorp/terraform-json v0.23.0/go.mod h1:MHdXbBAbSg0GvzuWazEGKAn/cyNfIB7mN6y7KJN6y2c=\n github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=\n@@ -572,8 +572,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=\n-golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.22.7\n toolchain go1.22.9\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/hashicorp/terraform-json v0.23.0\n \tgithub.com/stretchr/testify v1.9.0\n@@ -52,7 +52,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.7.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.20.1 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2 // indirect\n \tgithub.com/imdario/mergo v0.3.16 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n \tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n@@ -82,7 +82,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.15.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.21.0 // indirect\n-\tgolang.org/x/mod v0.21.0 // indirect\n+\tgolang.org/x/mod v0.22.0 // indirect\n \tgolang.org/x/net v0.23.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.4.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3 h1:LKouXohMqxE7u43gOHx57Zme/E3sgMpFq0yPArI4DiE=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3/go.mod h1:6HwC1k0Nr7cu1ZaMeIQjb+sQAHKSHhG5tytYoA8Sn6A=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0 h1:EcxvASC45eOFrkk+cw9vP8Wztms3ZMWAQyBNEaI5MdU=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0/go.mod h1:homk/qeh6p4f7onHkLc5Vy8nG31ZmDK2pamBdHrc1OM=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n@@ -400,8 +400,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc=\n github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 h1:RwY5HBgtBZ997UtKJAO2Rx+94ETyevwWEVXWx1SL5YY=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2 h1:h+wcDC5wTiM+5YKjuLtUSWJtdtMVJNCRCPHoWieLpM4=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.23.0 h1:sniCkExU4iKtTADReHzACkk8fnpQXrdD2xoR+lppBkI=\n github.com/hashicorp/terraform-json v0.23.0/go.mod h1:MHdXbBAbSg0GvzuWazEGKAn/cyNfIB7mN6y7KJN6y2c=\n github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=\n@@ -572,8 +572,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=\n-golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod \tgithub.com/hashicorp/hcl\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.22.7\n toolchain go1.22.9\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/hashicorp/terraform-json v0.23.0\n \tgithub.com/stretchr/testify v1.9.0\n@@ -52,7 +52,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.7.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.20.1 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2 // indirect\n \tgithub.com/imdario/mergo v0.3.16 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n \tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n@@ -82,7 +82,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.15.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.21.0 // indirect\n-\tgolang.org/x/mod v0.21.0 // indirect\n+\tgolang.org/x/mod v0.22.0 // indirect\n \tgolang.org/x/net v0.23.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.4.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3 h1:LKouXohMqxE7u43gOHx57Zme/E3sgMpFq0yPArI4DiE=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3/go.mod h1:6HwC1k0Nr7cu1ZaMeIQjb+sQAHKSHhG5tytYoA8Sn6A=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0 h1:EcxvASC45eOFrkk+cw9vP8Wztms3ZMWAQyBNEaI5MdU=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.0/go.mod h1:homk/qeh6p4f7onHkLc5Vy8nG31ZmDK2pamBdHrc1OM=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n@@ -400,8 +400,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc=\n github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 h1:RwY5HBgtBZ997UtKJAO2Rx+94ETyevwWEVXWx1SL5YY=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2 h1:h+wcDC5wTiM+5YKjuLtUSWJtdtMVJNCRCPHoWieLpM4=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.23.0 h1:sniCkExU4iKtTADReHzACkk8fnpQXrdD2xoR+lppBkI=\n github.com/hashicorp/terraform-json v0.23.0/go.mod h1:MHdXbBAbSg0GvzuWazEGKAn/cyNfIB7mN6y7KJN6y2c=\n github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=\n@@ -572,8 +572,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=\n-golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=\n+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | toolchain | patch | `1.22.8` -> `1.22.9` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.22.9`](https://redirect.github.com/golang/go/compare/go1.22.8...go1.22.9)\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS45LjUiLCJ1cGRhdGVkSW5WZXIiOiIzOS45LjUiLCJ0YXJnZXRCcmFuY2giOiJtYXN0ZXIiLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -2,7 +2,7 require module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.22.7\n \n-toolchain go1.22.8\n+toolchain go1.22.9\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.22.7\n \n-toolchain go1.22.8\n+toolchain go1.22.9\n \n require -2,7 \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.22.7\n \n-toolchain go1.22.8\n+toolchain go1.22.9\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.22.7\n \n-toolchain go1.22.8\n+toolchain go1.22.8\n+toolchain \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.3\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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 | minor | `>= 6.7.0, < 6.10.0` -> `>= 6.7.0, < 6.11.1` | `6.11.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | minor | `>= 6.5.0, < 6.10.0` -> `>= 6.5.0, < 6.11.1` | `6.11.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | minor | `>= 6.7.0, < 6.10.0` -> `>= 6.7.0, < 6.11.1` | `6.11.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | minor | `>= 6.5.0, < 6.10.0` -> `>= 6.5.0, < 6.11.1` | `6.11.1` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>hashicorp/terraform-provider-google (google)</summary>\n\n### [`v6.11.0`](https://redirect.github.com/hashicorp/terraform-provider-google/blob/HEAD/CHANGELOG.md#6110-Unreleased)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v6.10.0...v6.11.0)\n\n### [`v6.10.0`](https://redirect.github.com/hashicorp/terraform-provider-google/blob/HEAD/CHANGELOG.md#6100-November-4-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v6.9.0...v6.10.0)\n\nFEATURES:\n\n- **New Data Source:** `google_compute_instance_guest_attributes` ([#​20095](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20095))\n- **New Data Source:** `google_service_accounts` ([#​20062](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20062))\n- **New Resource:** `google_iap_settings` ([#​20085](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20085))\n\nIMPROVEMENTS:\n\n- apphub: added `GLOBAL` enum value to `scope.type` field in `google_apphub_application` resource ([#​20015](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20015))\n- assuredworkloads: added `workload_options` field to `google_assured_workloads_workload` resource ([#​19985](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19985))\n- bigquery: added `external_catalog_dataset_options` fields to `google_bigquery_dataset` resource (beta) ([#​20097](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20097))\n- bigquery: added descriptive validation errors for missing required fields in `google_bigquery_job` destination table configuration ([#​20077](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20077))\n- compute: `desired_status` on google_compute_instance can now be set to `TERMINATED` or `SUSPENDED` on instance creation ([#​20031](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20031))\n- compute: added `header_action` and `redirect_options` fields to `google_compute_security_policy_rule` resource ([#​20079](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20079))\n- compute: added `interface.ipv6-address` field in `google_compute_external_vpn_gateway` resource ([#​20091](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20091))\n- compute: added `propagated_connection_limit` and `connected_endpoints.propagated_connection_count` fields to `google_compute_service_attachment` resource ([#​20016](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20016))\n- compute: added plan-time validation to `name` on `google_compute_instance` ([#​20036](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20036))\n- compute: added support for `advanced_machine_features.turbo_mode` to `google_compute_instance`, `google_compute_instance_template`, and `google_compute_region_instance_template` ([#​20090](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20090))\n- container: added in-place update support for `labels`, `resource_manager_tags` and `workload_metadata_config` in `google_container_cluster.node_config` ([#​20038](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20038))\n- filestore: added `protocol` property to resource `google_filestore_instance` ([#​19982](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19982))\n- memorystore: added `mode` flag to `google_memorystore_instance` ([#​19988](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19988))\n- netapp: added `zone` and `replica_zone` fields to `google_netapp_storage_pool` resource ([#​19980](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19980))\n- netapp: added `zone` and `replica_zone` fields to `google_netapp_volume` resource ([#​19980](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19980))\n- networksecurity: added `tls_inspection_policy` field to `google_network_security_gateway_security_policy` ([#​19986](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19986))\n- resourcemanager: added `disabled` to `google_service_account` datasource ([#​20034](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20034))\n- spanner: added `asymmetric_autoscaling_options` field to `google_spanner_instance` ([#​20014](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20014))\n- sql: removed the client-side default of `ENTERPRISE` for `edition` in `google_sql_database_instance` so that `edition` is determined by the API when unset. This will cause new instances to use `ENTERPRISE_PLUS` as the default for POSTGRES\\_16. ([#​19977](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19977))\n- vmwareengine: added `autoscaling_settings` to `google_vmwareengine_private_cloud` resource ([#​20057](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20057))\n\nBUG FIXES:\n\n- accesscontextmanager: fixed permadiff for perimeter ingress / egress rule resources ([#​20046](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20046))\n- compute: fixed an error in `google_compute_security_policy_rule` that prevented updating the default rule ([#​20066](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20066))\n- container: fixed missing in-place updates for some `google_container_cluster.node_config` subfields ([#​20038](https://redirect.github.com/hashicorp/terraform-provider-google/pull/20038))\n\n</details>\n\n<details>\n<summary>hashicorp/terraform-provider-google-beta (google-beta)</summary>\n\n### [`v6.11.0`](https://redirect.github.com/hashicorp/terraform-provider-google-beta/blob/HEAD/CHANGELOG.md#6110-Unreleased)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google-beta/compare/v6.10.0...v6.11.0)\n\n### [`v6.10.0`](https://redirect.github.com/hashicorp/terraform-provider-google-beta/blob/HEAD/CHANGELOG.md#6100-November-4-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google-beta/compare/v6.9.0...v6.10.0)\n\nFEATURES:\n\n- **New Data Source:** `google_compute_instance_guest_attributes` ([#​8556](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8556))\n- **New Data Source:** `google_service_accounts` ([#​8532](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8532))\n- **New Resource:** `google_iap_settings` ([#​8548](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8548))\n\nIMPROVEMENTS:\n\n- apphub: added `GLOBAL` enum value to `scope.type` field in `google_apphub_application` resource ([#​8504](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8504))\n- assuredworkloads: added `workload_options` field to `google_assured_workloads_workload` resource ([#​8495](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8495))\n- backupdr: marked `networks` field optional in `google_backup_dr_management_server` resource ([#​8594](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8594))\n- bigquery: added `external_catalog_dataset_options` fields to `google_bigquery_dataset` resource (beta) ([#​8558](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8558))\n- bigquery: added descriptive validation errors for missing required fields in `google_bigquery_job` destination table configuration ([#​8542](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8542))\n- compute: `desired_status` on google_compute_instance can now be set to `TERMINATED` or `SUSPENDED` on instance creation ([#​8515](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8515))\n- compute: added `header_action` and `redirect_options` fields to `google_compute_security_policy_rule` resource ([#​8544](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8544))\n- compute: added `interface.ipv6-address` field in `google_compute_external_vpn_gateway` resource ([#​8552](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8552))\n- compute: added plan-time validation to `name` on `google_compute_instance` ([#​8520](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8520))\n- compute: added support for `advanced_machine_features.turbo_mode` to `google_compute_instance`, `google_compute_instance_template`, and `google_compute_region_instance_template` ([#​8551](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8551))\n- container: added in-place update support for `labels`, `resource_manager_tags` and `workload_metadata_config` in `google_container_cluster.node_config` ([#​8522](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8522))\n- memorystore: added `mode` flag to `google_memorystore_instance` ([#​8498](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8498))\n- resourcemanager: added `disabled` to `google_service_account` datasource ([#​8518](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8518))\n- spanner: added `asymmetric_autoscaling_options` field to `google_spanner_instance` ([#​8503](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8503))\n- sql: removed the client-side default of `ENTERPRISE` for `edition` in `google_sql_database_instance` so that `edition` is determined by the API when unset. This will cause new instances to use `ENTERPRISE_PLUS` as the default for POSTGRES\\_16. ([#​8490](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8490))\n- vmwareengine: added `autoscaling_settings` to `google_vmwareengine_private_cloud` resource ([#​8529](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8529))\n\nBUG FIXES:\n\n- accesscontextmanager: fixed permadiff for perimeter ingress / egress rule resources ([#​8526](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8526))\n- compute: fixed an error in `google_compute_region_security_policy_rule` that prevented updating the default rule ([#​8535](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8535))\n- compute: fixed an error in `google_compute_security_policy_rule` that prevented updating the default rule ([#​8535](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8535))\n- container: fixed missing in-place updates for some `google_container_cluster.node_config` subfields ([#​8522](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8522))\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 these updates 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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMS41IiwidXBkYXRlZEluVmVyIjoiMzkuMTEuNSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nautogen/main/versions.tf.tmpl\n@@ -24,33 +24,33 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n {% elif beta_cluster and autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n {% else %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n {% endif %}\n kubernetes = {\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice B:\nautogen/main/versions.tf.tmpl\n@@ -24,33 +24,33 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n {% elif beta_cluster and autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n {% else %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n {% endif %}\n kubernetes = {\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice C:\nautogen/main/versions.tf.tmpl\n@@ -24,33 +24,33 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n {% elif beta_cluster and autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n {% else %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n {% endif %}\n kubernetes = {\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n kubernetes = {\n = = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice D:\nautogen/main/versions.tf.tmpl\n@@ -24,33 +24,33 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n {% elif beta_cluster and autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n {% else %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n {% endif %}\n kubernetes = {\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 6.10.0\"\n+ version = \">= 6.5.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = 6.7.0, 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 6.10.0\"\n+ version = \">= 6.7.0, < 6.11.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nTPG v6.10 has several breaking change which I've started addressing in https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/2180, however this will unblocked PRs till then.\r\n\r\nAlso somewhat simplify the version template\n\n---\n\nChoice A:\nautogen/main/versions.tf.tmpl\n@@ -24,70 +24,35 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n- kubernetes = {\n- source = \"hashicorp/kubernetes\"\n- version = \"~> 2.10\"\n- }\n- random = {\n- source = \"hashicorp/random\"\n- version = \">= 2.1\"\n- }\n- }\n- provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n- }\n {% elif beta_cluster and autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n- kubernetes = {\n- source = \"hashicorp/kubernetes\"\n- version = \"~> 2.10\"\n- }\n- random = {\n- source = \"hashicorp/random\"\n- version = \">= 2.1\"\n- }\n- }\n- provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n- }\n {% elif autopilot_cluster %}\n required_providers {\n \"hashicorp/google\"\n- = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n- kubernetes = {\n- source = \"hashicorp/kubernetes\"\n- version = \"~> 2.10\"\n- }\n- random = {\n- source = \"hashicorp/random\"\n- version = \">= 2.1\"\n- }\n- }\n- provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n- }\n {% else %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n+{% endif %}\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n version = \"~> 2.10\"\n@@ -97,8 +62,7 @@ terraform {\n version = \">= 2.1\"\n }\n }\n- provider_meta \"google\" {\n+ provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n }\n-{% endif %}\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice B:\nautogen/main/versions.tf.tmpl\n@@ -24,70 +24,35 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n- kubernetes = {\n- source = \"hashicorp/kubernetes\"\n- version = \"~> 2.10\"\n- }\n- random = {\n- source = \"hashicorp/random\"\n- version = 2.1\"\n- }\n- }\n- provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n- }\n {% elif beta_cluster and autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n- kubernetes = {\n- source = \"hashicorp/kubernetes\"\n- version = \"~> 2.10\"\n- }\n- random = {\n- source = \"hashicorp/random\"\n- version = \">= 2.1\"\n- }\n- }\n- provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n- }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n- kubernetes = {\n- source = \"hashicorp/kubernetes\"\n- version = \"~> 2.10\"\n- }\n- random = {\n- source = \"hashicorp/random\"\n- version = \">= 2.1\"\n- }\n- }\n- provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n- }\n {% else %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n+{% endif %}\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n version = \"~> 2.10\"\n@@ -97,8 +62,7 @@ terraform {\n version = \">= 2.1\"\n }\n }\n- provider_meta \"google\" {\n+ provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n }\n-{% endif %}\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice C:\nautogen/main/versions.tf.tmpl\n@@ -24,70 +24,35 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n- kubernetes = {\n- source = \"hashicorp/kubernetes\"\n- version = \"~> 2.10\"\n- }\n- random = {\n- source = \"hashicorp/random\"\n- version = \">= 2.1\"\n- }\n- }\n- provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n- }\n {% elif beta_cluster and autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n- kubernetes = {\n- source = \"hashicorp/kubernetes\"\n- version = \"~> 2.10\"\n- }\n- random = {\n- source = \"hashicorp/random\"\n- version = \">= 2.1\"\n- }\n- }\n- provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n- }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n- kubernetes = {\n- source = \"hashicorp/kubernetes\"\n- version = \"~> 2.10\"\n- }\n- random = {\n- source = \"hashicorp/random\"\n- version = \">= 2.1\"\n- }\n- }\n- provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n- }\n {% else %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n+{% endif %}\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n version = \"~> 2.10\"\n@@ -97,8 +62,7 @@ terraform {\n version = \">= 2.1\"\n }\n }\n- provider_meta \"google\" {\n+ provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n }\n-{% endif %}\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n provider_meta source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice D:\nautogen/main/versions.tf.tmpl\n@@ -24,70 +24,35 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n- kubernetes = {\n- source = \"hashicorp/kubernetes\"\n- version = \"~> 2.10\"\n- }\n- random = {\n- source = \"hashicorp/random\"\n- version = \">= 2.1\"\n- }\n- }\n- provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n- }\n {% elif beta_cluster and autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n- kubernetes = {\n- source = \"hashicorp/kubernetes\"\n- version = \"~> 2.10\"\n- }\n- random = {\n- source = \"hashicorp/random\"\n- version = \">= 2.1\"\n- }\n- }\n- provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n- }\n {% elif autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n- kubernetes = {\n- source = \"hashicorp/kubernetes\"\n- version = \"~> 2.10\"\n- }\n- random = {\n- source = \"hashicorp/random\"\n- version = \">= 2.1\"\n- }\n- }\n- provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n- }\n {% else %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n+{% endif %}\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n version = \"~> 2.10\"\n@@ -97,8 +62,7 @@ terraform {\n version = \">= 2.1\"\n }\n }\n- provider_meta \"google\" {\n+ provider_meta \"{% if beta_cluster %}google-beta{% else %}google{% endif %}\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0\"\n }\n-{% endif %}\n }\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.5.0, < 7\"\n+ version = \">= 6.5.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.7.0, < 7\"\n+ version = \">= 6.7.0, < 6.10.0\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nAdds [create_ignore_already_exists](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_service_account#create_ignore_already_exists) to workload-identity module to ignore an already existing google-service-account when hitting the [Provider produced inconsistent result after apply](https://github.com/hashicorp/terraform-provider-google/issues/18087) issue.\r\n\r\nFixes #2141 \n\n---\n\nChoice A:\nmodules/workload-identity/README.md\n@@ -148,6 +148,7 @@ Error: Get \"http://localhost/api/v1/namespaces/default/serviceaccounts/your-serv\n | annotate\\_k8s\\_sa | Annotate the kubernetes service account with 'iam.gke.io/gcp-service-account' annotation. Valid in cases when an existing SA is used. | `bool` | `true` | no |\n | automount\\_service\\_account\\_token | Enable automatic mounting of the service account token | `bool` | `false` | no |\n | cluster\\_name | Cluster name. Required if using existing KSA. | `string` | `\"\"` | no |\n+| gcp\\_sa\\_create\\_ignore\\_already\\_exists | If set to true, skip service account creation if a service account with the same email already exists. | `bool` | `null` | no |\n | gcp\\_sa\\_description | The Service Google service account desciption; if null, will be left out | `string` | `null` | no |\n | gcp\\_sa\\_display\\_name | The Google service account display name; if null, a default string will be used | `string` | `null` | no |\n | gcp\\_sa\\_name | Name for the Google service account; overrides `var.name`. | `string` | `null` | no |\n---\nmodules/workload-identity/main.tf\n@@ -42,10 +42,11 @@ data \"google_service_account\" \"cluster_service_account\" {\n resource \"google_service_account\" \"cluster_service_account\" {\n count = var.use_existing_gcp_sa ? 0 : 1\n \n- account_id = local.gcp_given_name\n- display_name = coalesce(var.gcp_sa_display_name, substr(\"GCP SA bound to K8S SA ${local.k8s_sa_project_id}[${local.k8s_given_name}]\", 0, 100))\n- description = var.gcp_sa_description\n- project = var.project_id\n+ account_id = local.gcp_given_name\n+ display_name = coalesce(var.gcp_sa_display_name, substr(\"GCP SA bound to K8S SA ${local.k8s_sa_project_id}[${local.k8s_given_name}]\", 0, 100))\n+ description = var.gcp_sa_description\n+ project @@ = var.project_id\n+ create_ignore_already_exists = var.gcp_sa_create_ignore_already_exists\n }\n \n resource \"kubernetes_service_account\" \"main\" {\n---\nmodules/workload-identity/variables.tf\n@@ -137,3 +137,9 @@ variable \"gcp_sa_description\" {\n error_message = \"The Google service account description must be at most 256 characters\"\n }\n }\n+\n+variable \"gcp_sa_create_ignore_already_exists\" {\n+ description = \"If set to true, skip service account creation if a service account with the same email already exists.\"\n+ type = bool\n+ default = null\n+}\n---\n\n\n---\n\nChoice B:\nmodules/workload-identity/README.md\n@@ -148,6 +148,7 @@ Error: Get \"http://localhost/api/v1/namespaces/default/serviceaccounts/your-serv\n | annotate\\_k8s\\_sa | Annotate the kubernetes service account with 'iam.gke.io/gcp-service-account' annotation. Valid in cases when an existing SA is used. | `bool` | `true` | no |\n | automount\\_service\\_account\\_token | Enable automatic mounting of the service account token | `bool` | `false` | no |\n | cluster\\_name | Cluster name. Required if using existing KSA. | `string` | `\"\"` | no |\n+| gcp\\_sa\\_create\\_ignore\\_already\\_exists | If set to true, skip service account creation if a service account with the same email already exists. | `bool` | `null` | no |\n | gcp\\_sa\\_description | The Service Google service account desciption; if null, will be left out | `string` | `null` | no |\n | gcp\\_sa\\_display\\_name | The Google service account display name; if null, a default string will be used | `string` | `null` | no gcp\\_sa\\_display\\_name | gcp\\_sa\\_name | Name for the Google service account; overrides `var.name`. | `string` | `null` | no |\n---\nmodules/workload-identity/main.tf\n@@ -42,10 +42,11 @@ data \"google_service_account\" \"cluster_service_account\" {\n resource \"google_service_account\" \"cluster_service_account\" {\n count = var.use_existing_gcp_sa ? 0 : 1\n \n- account_id = local.gcp_given_name\n- display_name = coalesce(var.gcp_sa_display_name, substr(\"GCP SA bound to K8S SA ${local.k8s_sa_project_id}[${local.k8s_given_name}]\", 0, 100))\n- description = var.gcp_sa_description\n- project = var.project_id\n+ account_id = local.gcp_given_name\n+ display_name = coalesce(var.gcp_sa_display_name, substr(\"GCP SA bound to K8S SA ${local.k8s_sa_project_id}[${local.k8s_given_name}]\", 0, 100))\n+ description = var.gcp_sa_description\n+ project = var.project_id\n+ create_ignore_already_exists = var.gcp_sa_create_ignore_already_exists\n }\n \n resource \"kubernetes_service_account\" \"main\" {\n---\nmodules/workload-identity/variables.tf\n@@ -137,3 +137,9 @@ variable \"gcp_sa_description\" {\n error_message = \"The Google service account description must be at most 256 characters\"\n }\n }\n+\n+variable \"gcp_sa_create_ignore_already_exists\" {\n+ description = \"If set to true, skip service account creation if a service account with the same email already exists.\"\n+ type = bool\n+ default = null\n+}\n---\n\n\n---\n\nChoice C:\nmodules/workload-identity/README.md\n@@ -148,6 +148,7 @@ Error: Get \"http://localhost/api/v1/namespaces/default/serviceaccounts/your-serv\n | annotate\\_k8s\\_sa | Annotate the kubernetes service account with 'iam.gke.io/gcp-service-account' annotation. Valid in cases when an existing SA is used. | `bool` | `true` | no |\n | automount\\_service\\_account\\_token | Enable automatic mounting of the service account token | `bool` | `false` | no |\n | cluster\\_name | Cluster name. Required if using existing KSA. | `string` | `\"\"` | no |\n+| gcp\\_sa\\_create\\_ignore\\_already\\_exists | If set to true, skip service account creation if a service account with the same email already exists. | `bool` | `null` | no |\n | gcp\\_sa\\_description | The Service Google service account desciption; if null, will be left out | `string` | `null` | no |\n | gcp\\_sa\\_display\\_name | The Google service account display name; if null, a default string will be used | `string` | `null` | no |\n | gcp\\_sa\\_name | Name for the Google service account; overrides `var.name`. | `string` | `null` | no |\n---\nmodules/workload-identity/main.tf\n@@ -42,10 +42,11 @@ data \"google_service_account\" \"cluster_service_account\" {\n resource \"google_service_account\" \"cluster_service_account\" {\n count = var.use_existing_gcp_sa ? 0 : 1\n \n- account_id = local.gcp_given_name\n- display_name = coalesce(var.gcp_sa_display_name, substr(\"GCP SA bound to K8S SA ${local.k8s_sa_project_id}[${local.k8s_given_name}]\", 0, 100))\n- description = var.gcp_sa_description\n- project = var.project_id\n+ account_id = local.gcp_given_name\n+ display_name = coalesce(var.gcp_sa_display_name, substr(\"GCP SA bound to K8S SA ${local.k8s_sa_project_id}[${local.k8s_given_name}]\", 0, 100))\n+ description = var.gcp_sa_description\n+ project = var.project_id\n+ create_ignore_already_exists = var.gcp_sa_create_ignore_already_exists\n }\n \n resource \"kubernetes_service_account\" \"main\" {\n---\nmodules/workload-identity/variables.tf\n@@ -137,3 +137,9 @@ variable \"gcp_sa_description\" {\n error_message = \"The Google service account description must be at most 256 characters\"\n }\n }\n+\n+variable \"gcp_sa_create_ignore_already_exists\" {\n+ description = \"If set to true, skip service account creation if a service account with the same email already exists.\"\n+ type = bool\n+ default = null\n+}\n---\n\n\n---\n\nChoice D:\nmodules/workload-identity/README.md\n@@ -148,6 +148,7 @@ Error: Get \"http://localhost/api/v1/namespaces/default/serviceaccounts/your-serv\n | annotate\\_k8s\\_sa | Annotate the kubernetes service account with 'iam.gke.io/gcp-service-account' annotation. Valid in cases when an existing SA is used. | `bool` | `true` | no |\n | automount\\_service\\_account\\_token | Enable automatic mounting of the service account token | `bool` | `false` | no |\n | cluster\\_name | Cluster name. Required if using existing KSA. | `string` | `\"\"` | no |\n+| gcp\\_sa\\_create\\_ignore\\_already\\_exists | If set to true, skip service account creation if a service account with the same email already exists. | `bool` | `null` | no |\n | gcp\\_sa\\_description | The Service Google service account desciption; if null, will be left out | `string` | `null` | no |\n | gcp\\_sa\\_display\\_name | The Google service account display name; if null, a default string will be used | `string` | `null` | no |\n | gcp\\_sa\\_name | Name for the Google service account; overrides `var.name`. | `string` | `null` | no |\n---\nmodules/workload-identity/main.tf\n@@ -42,10 +42,11 @@ data \"google_service_account\" \"cluster_service_account\" {\n resource \"google_service_account\" \"cluster_service_account\" {\n count = var.use_existing_gcp_sa ? 0 : 1\n \n- account_id = local.gcp_given_name\n- display_name = coalesce(var.gcp_sa_display_name, substr(\"GCP SA bound to K8S SA ${local.k8s_sa_project_id}[${local.k8s_given_name}]\", 0, 100))\n- description = var.gcp_sa_description\n- project = var.project_id\n+ account_id = local.gcp_given_name\n+ display_name = coalesce(var.gcp_sa_display_name, substr(\"GCP SA bound to K8S SA ${local.k8s_sa_project_id}[${local.k8s_given_name}]\", 0, 100))\n+ description exists. = var.gcp_sa_description\n+ project = var.project_id\n+ create_ignore_already_exists = var.gcp_sa_create_ignore_already_exists\n }\n \n resource \"kubernetes_service_account\" \"main\" {\n---\nmodules/workload-identity/variables.tf\n@@ -137,3 +137,9 @@ variable \"gcp_sa_description\" {\n error_message = \"The Google service account description must be at most 256 characters\"\n }\n }\n+\n+variable \"gcp_sa_create_ignore_already_exists\" {\n+ description = \"If set to true, skip service account creation if a service account with the same email already exists.\"\n+ type = bool\n+ default = null\n+}\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n#2142 introduced `gcp_sa_create_ignore_already_exists` variable for workload-identity module without bumping to TPG<=5.12.0 and fails on installations with older TPG.\n\n---\n\nChoice A:\nmodules/workload-identity/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n \">= google = {\n source = \"hashicorp/google\"\n- version = \">= 3.39.0, < 7\"\n+ version = \">= 5.12.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice B:\nmodules/workload-identity/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n = {\n source = \"hashicorp/google\"\n- version = \">= 3.39.0, < 7\"\n+ version = \">= 5.12.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice C:\nmodules/workload-identity/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.39.0, < 7\"\n+ version = \">= 5.12.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice D:\nmodules/workload-identity/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n +21,7 source = \"hashicorp/google\"\n- version = \">= 3.39.0, < 7\"\n+ version = \">= 5.12.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThese have already be migrated to CFT tests\n\n---\n\nChoice A:\n.kitchen.yml\n@@ -32,57 +32,6 @@ platforms:\n - name: local\n \n suites:\n- - name: \"shared_vpc\"\n- transport:\n- root_module_directory: test/fixtures/shared_vpc\n- verifier:\n- systems:\n- - name: shared_vpc\n- backend: local\n- - name: \"safer_cluster\"\n- transport:\n- root_module_directory: test/fixtures/safer_cluster\n- verifier:\n- systems:\n- - name: safer_cluster\n- backend: local\n- controls:\n- - gcloud\n- - name: inspec-gcp\n- backend: gcp\n- controls:\n- - network\n- - name: \"simple_regional\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional\n- verifier:\n- systems:\n- - name: simple_regional\n- backend: local\n- - name: \"simple_regional_with_networking\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional_with_networking\n- verifier:\n- systems:\n- - name: simple_regional_with_networking\n- backend: local\n- controls:\n- - gcloud\n- - name: subnet\n- backend: local\n- controls:\n- - subnet\n- - name: network\n- backend: gcp\n- controls:\n- - network\n- - name: \"simple_regional_private\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional_private\n- verifier:\n- systems:\n- - name: simple_regional_private\n- backend: local\n - name: \"simple_regional_with_gateway_api\"\n transport:\n root_module_directory: test/fixtures/simple_regional_with_gateway_api\n@@ -97,36 +46,6 @@ suites:\n systems:\n - name: simple_regional_with_ipv6\n backend: local\n- - name: \"simple_regional_with_kubeconfig\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional_with_kubeconfig\n- verifier:\n- systems:\n- - name: simple_regional_with_kubeconfig\n- backend: local\n- - name: \"simple_zonal\"\n- transport:\n- root_module_directory: test/fixtures/simple_zonal\n- verifier:\n- systems:\n- - name: gcloud\n- backend: local\n- controls:\n- - gcloud\n- - acm\n- - name: gcp\n- backend: gcp\n- controls:\n- - gcp\n- - name: \"simple_zonal_private\"\n- transport:\n- root_module_directory: test/fixtures/simple_zonal_private\n- verifier:\n- systems:\n- - name: simple_zonal_private\n- backend: local\n- controls:\n- - gcloud\n - name: \"stub_domains\"\n transport:\n root_module_directory: test/fixtures/stub_domains\n@@ -179,29 +98,6 @@ suites:\n systems:\n - name: workload_metadata_config\n backend: local\n- - name: \"simple_windows_node_pool\"\n- transport:\n- root_module_directory: test/fixtures/simple_windows_node_pool\n- verifier:\n- systems:\n- - name: gcloud\n- backend: local\n- controls:\n- - gcloud\n- - name: gcp\n- backend: gcp\n- controls:\n- - gcp\n- - name: \"deploy_service\"\n- transport:\n- root_module_directory: test/fixtures/deploy_service\n- verifier:\n- systems:\n- - name: deploy_service\n- backend: local\n- controls:\n- - gcloud\n- - kubectl\n - name: \"node_pool\"\n transport:\n root_module_directory: test/fixtures/node_pool\n@@ -212,41 +108,10 @@ suites:\n controls:\n - gcloud\n - kubectl\n- - name: \"sandbox_enabled\"\n- transport:\n- root_module_directory: test/fixtures/sandbox_enabled\n- verifier:\n- systems:\n- - name: sandbox_enabled\n- backend: local\n - name: \"safer_cluster_iap_bastion\"\n transport:\n root_module_directory: test/fixtures/safer_cluster_iap_bastion\n verifier:\n systems:\n - name: safer_cluster_iap_bastion\n backend: local\n- - name: \"simple_zonal_with_asm\"\n- transport:\n- root_module_directory: test/fixtures/simple_zonal_with_asm\n- verifier:\n- systems:\n- - name: simple_zonal_with_asm\n- backend: local\n- controls:\n- - gcloud\n- - kubectl\n- - name: \"simple_autopilot_private\"\n- transport:\n- root_module_directory: test/fixtures/simple_autopilot_private\n- verifier:\n- systems:\n- - name: simple_autopilot_private\n- backend: local\n- - name: \"simple_autopilot_public\"\n- transport:\n- root_module_directory: test/fixtures/simple_autopilot_public\n- verifier:\n- systems:\n- - name: simple_autopilot_public\n- backend: local\n---\n\n\n---\n\nChoice B:\n.kitchen.yml\n@@ -32,57 +32,6 @@ platforms:\n - name: local\n \n suites:\n- - name: \"shared_vpc\"\n- transport:\n- root_module_directory: test/fixtures/shared_vpc\n- verifier:\n- systems:\n- - name: shared_vpc\n- backend: local\n- - name: \"safer_cluster\"\n- transport:\n- root_module_directory: test/fixtures/safer_cluster\n- verifier:\n- systems:\n- - name: safer_cluster\n- backend: local\n- controls:\n- - gcloud\n- - name: inspec-gcp\n- backend: gcp\n- controls:\n- - network\n- - name: \"simple_regional\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional\n- verifier:\n- systems:\n- - name: simple_regional\n- backend: local\n- - name: \"simple_regional_with_networking\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional_with_networking\n- verifier:\n- systems:\n- - name: simple_regional_with_networking\n- backend: local\n- controls:\n- - gcloud\n- - name: subnet\n- backend: local\n- controls:\n- - subnet\n- - name: network\n- backend: gcp\n- controls:\n- - network\n- - name: \"simple_regional_private\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional_private\n- verifier:\n- systems:\n- - name: simple_regional_private\n- backend: local\n - name: \"simple_regional_with_gateway_api\"\n transport:\n root_module_directory: test/fixtures/simple_regional_with_gateway_api\n@@ -97,36 +46,6 @@ suites:\n systems:\n - name: simple_regional_with_ipv6\n backend: local\n- - name: \"simple_regional_with_kubeconfig\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional_with_kubeconfig\n- verifier:\n- systems:\n- - name: simple_regional_with_kubeconfig\n- backend: local\n- - name: \"simple_zonal\"\n- transport:\n- root_module_directory: test/fixtures/simple_zonal\n- verifier:\n- systems:\n- - name: gcloud\n- backend: local\n- controls:\n- - gcloud\n- - acm\n- - name: gcp\n- backend: gcp\n- controls:\n- - gcp\n- - name: \"simple_zonal_private\"\n- transport:\n- root_module_directory: test/fixtures/simple_zonal_private\n- verifier:\n- systems:\n- - name: simple_zonal_private\n- backend: local\n- controls:\n- - gcloud\n - name: \"stub_domains\"\n transport:\n root_module_directory: test/fixtures/stub_domains\n@@ -179,29 +98,6 @@ suites:\n systems:\n - name: workload_metadata_config\n backend: local\n- - name: \"simple_windows_node_pool\"\n- transport:\n- root_module_directory: test/fixtures/simple_windows_node_pool\n- verifier:\n- systems:\n- - name: gcloud\n- backend: local\n- controls:\n- - gcloud\n- - name: gcp\n- backend: gcp\n- controls:\n- - gcp\n- - name: \"deploy_service\"\n- transport:\n- root_module_directory: test/fixtures/deploy_service\n- verifier:\n- systems:\n- - name: deploy_service\n- backend: local\n- controls:\n- - gcloud\n- - kubectl\n - name: \"node_pool\"\n transport:\n root_module_directory: test/fixtures/node_pool\n@@ -212,41 +108,10 @@ suites:\n controls:\n - gcloud\n - kubectl\n- - name: \"sandbox_enabled\"\n- transport:\n- root_module_directory: test/fixtures/sandbox_enabled\n- verifier:\n- systems:\n- - name: sandbox_enabled\n- backend: local\n - name: \"safer_cluster_iap_bastion\"\n transport:\n root_module_directory: test/fixtures/safer_cluster_iap_bastion\n verifier:\n systems:\n - name: safer_cluster_iap_bastion\n backend: local\n- - name: \"simple_zonal_with_asm\"\n- transport:\n- root_module_directory: test/fixtures/simple_zonal_with_asm\n- verifier:\n- systems:\n- - name: simple_zonal_with_asm\n- backend: local\n- controls:\n- - gcloud\n- - kubectl\n- - name: \"simple_autopilot_private\"\n- transport:\n- root_module_directory: test/fixtures/simple_autopilot_private\n- verifier:\n- systems:\n- - name: simple_autopilot_private\n- backend: local\n- - name: \"simple_autopilot_public\"\n- transport:\n- root_module_directory: test/fixtures/simple_autopilot_public\n- verifier:\n- systems:\n- - name: simple_autopilot_public\n- backend: local\n---\n\n\n---\n\nChoice C:\n.kitchen.yml\n@@ -32,57 +32,6 @@ platforms:\n - name: local\n \n suites:\n- - name: \"shared_vpc\"\n- transport:\n- root_module_directory: test/fixtures/shared_vpc\n- verifier:\n- systems:\n- - name: shared_vpc\n- backend: local\n- - name: \"safer_cluster\"\n- transport:\n- root_module_directory: test/fixtures/safer_cluster\n- verifier:\n- systems:\n- - name: safer_cluster\n- backend: local\n- controls:\n- - gcloud\n- - name: inspec-gcp\n- backend: gcp\n- controls:\n- - network\n- - name: \"simple_regional\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional\n- verifier:\n- systems:\n- - name: simple_regional\n- backend: local\n- - name: \"simple_regional_with_networking\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional_with_networking\n- verifier:\n- systems:\n- - name: simple_regional_with_networking\n- backend: local\n- controls:\n- - gcloud\n- - name: subnet\n- backend: local\n- controls:\n- - subnet\n- - name: network\n- backend: gcp\n- controls:\n- - network\n- - name: \"simple_regional_private\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional_private\n- verifier:\n- systems:\n- - name: simple_regional_private\n- backend: local\n - name: \"simple_regional_with_gateway_api\"\n transport:\n root_module_directory: test/fixtures/simple_regional_with_gateway_api\n@@ -97,36 +46,6 @@ suites:\n systems:\n - name: simple_regional_with_ipv6\n backend: local\n- - name: \"simple_regional_with_kubeconfig\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional_with_kubeconfig\n- systems:\n- - name: simple_regional_with_kubeconfig\n- backend: local\n- - name: \"simple_zonal\"\n- transport:\n- root_module_directory: test/fixtures/simple_zonal\n- verifier:\n- systems:\n- - name: gcloud\n- backend: local\n- controls:\n- - gcloud\n- - acm\n- - name: gcp\n- backend: gcp\n- controls:\n- - gcp\n- - name: \"simple_zonal_private\"\n- transport:\n- root_module_directory: test/fixtures/simple_zonal_private\n- verifier:\n- systems:\n- - name: simple_zonal_private\n- backend: local\n- controls:\n- - gcloud\n - name: \"stub_domains\"\n transport:\n root_module_directory: test/fixtures/stub_domains\n@@ -179,29 +98,6 @@ suites:\n systems:\n - name: workload_metadata_config\n backend: local\n- - name: \"simple_windows_node_pool\"\n- transport:\n- root_module_directory: test/fixtures/simple_windows_node_pool\n- verifier:\n- systems:\n- - name: gcloud\n- backend: local\n- controls:\n- - gcloud\n- - name: gcp\n- backend: gcp\n- controls:\n- - gcp\n- - name: \"deploy_service\"\n- transport:\n- root_module_directory: test/fixtures/deploy_service\n- verifier:\n- systems:\n- - name: deploy_service\n- backend: local\n- controls:\n- - gcloud\n- - kubectl\n - name: \"node_pool\"\n transport:\n root_module_directory: test/fixtures/node_pool\n@@ -212,41 +108,10 @@ suites:\n controls:\n - gcloud\n - kubectl\n- - name: \"sandbox_enabled\"\n- transport:\n- root_module_directory: test/fixtures/sandbox_enabled\n- verifier:\n- systems:\n- - name: sandbox_enabled\n- backend: local\n - name: \"safer_cluster_iap_bastion\"\n transport:\n root_module_directory: test/fixtures/safer_cluster_iap_bastion\n verifier:\n systems:\n - name: safer_cluster_iap_bastion\n backend: local\n- - name: \"simple_zonal_with_asm\"\n- transport:\n- root_module_directory: test/fixtures/simple_zonal_with_asm\n- verifier:\n- systems:\n- - name: simple_zonal_with_asm\n- backend: local\n- controls:\n- - gcloud\n- - kubectl\n- - name: \"simple_autopilot_private\"\n- transport:\n- root_module_directory: test/fixtures/simple_autopilot_private\n- verifier:\n- systems:\n- - name: simple_autopilot_private\n- backend: local\n- - name: \"simple_autopilot_public\"\n- transport:\n- root_module_directory: test/fixtures/simple_autopilot_public\n- verifier:\n- systems:\n- - name: simple_autopilot_public\n- backend: local\n---\n\n\n---\n\nChoice D:\n.kitchen.yml\n@@ -32,57 +32,6 @@ platforms:\n - name: local\n \n suites:\n- - name: \"shared_vpc\"\n- transport:\n- root_module_directory: test/fixtures/shared_vpc\n- verifier:\n- systems:\n- - name: shared_vpc\n- backend: local\n- - name: \"safer_cluster\"\n- transport:\n- root_module_directory: test/fixtures/safer_cluster\n- verifier:\n- systems:\n- - name: safer_cluster\n- backend: local\n- controls:\n- - gcloud\n- - name: inspec-gcp\n- backend: gcp\n- controls:\n- - network\n- - name: \"simple_regional\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional\n- verifier:\n- systems:\n- - name: simple_regional\n- backend: local\n- - name: \"simple_regional_with_networking\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional_with_networking\n- verifier:\n- systems:\n- - name: simple_regional_with_networking\n- backend: local\n- controls:\n- - gcloud\n- - name: subnet\n- backend: local\n- controls:\n- - subnet\n- - name: network\n- backend: gcp\n- controls:\n- - network\n- - name: \"simple_regional_private\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional_private\n- verifier:\n- systems:\n- - name: simple_regional_private\n- backend: local\n - name: \"simple_regional_with_gateway_api\"\n transport:\n root_module_directory: test/fixtures/simple_regional_with_gateway_api\n@@ -97,36 +46,6 @@ suites:\n systems:\n - name: simple_regional_with_ipv6\n backend: local\n- - name: \"simple_regional_with_kubeconfig\"\n- transport:\n- root_module_directory: test/fixtures/simple_regional_with_kubeconfig\n- verifier:\n- systems:\n- - name: simple_regional_with_kubeconfig\n- backend: local\n- - name: \"simple_zonal\"\n- transport:\n- root_module_directory: test/fixtures/simple_zonal\n- verifier:\n- systems:\n- - name: gcloud\n- backend: local\n- controls:\n- - gcloud\n- - acm\n- - name: gcp\n- backend: gcp\n- controls:\n- - gcp\n- - name: \"simple_zonal_private\"\n- transport:\n- root_module_directory: test/fixtures/simple_zonal_private\n- verifier:\n- systems:\n- - name: simple_zonal_private\n- backend: local\n- controls:\n- - gcloud\n - name: \"stub_domains\"\n transport:\n test/fixtures/stub_domains\n@@ -179,29 +98,6 @@ suites:\n systems:\n - name: workload_metadata_config\n backend: local\n- - name: \"simple_windows_node_pool\"\n- transport:\n- root_module_directory: test/fixtures/simple_windows_node_pool\n- verifier:\n- systems:\n- - name: gcloud\n- backend: local\n- controls:\n- - gcloud\n- - name: gcp\n- backend: gcp\n- controls:\n- - gcp\n- - name: \"deploy_service\"\n- transport:\n- root_module_directory: test/fixtures/deploy_service\n- verifier:\n- systems:\n- - name: deploy_service\n- backend: local\n- controls:\n- - gcloud\n- - kubectl\n - name: \"node_pool\"\n transport:\n root_module_directory: test/fixtures/node_pool\n@@ -212,41 +108,10 @@ suites:\n controls:\n - gcloud\n - kubectl\n- - name: \"sandbox_enabled\"\n- transport:\n- root_module_directory: test/fixtures/sandbox_enabled\n- verifier:\n- systems:\n- - name: sandbox_enabled\n- backend: local\n - name: \"safer_cluster_iap_bastion\"\n transport:\n root_module_directory: test/fixtures/safer_cluster_iap_bastion\n verifier:\n systems:\n - name: safer_cluster_iap_bastion\n backend: local\n- - name: \"simple_zonal_with_asm\"\n- transport:\n- root_module_directory: test/fixtures/simple_zonal_with_asm\n- verifier:\n- systems:\n- - name: simple_zonal_with_asm\n- backend: local\n- controls:\n- - gcloud\n- - kubectl\n- - name: \"simple_autopilot_private\"\n- transport:\n- root_module_directory: test/fixtures/simple_autopilot_private\n- verifier:\n- systems:\n- - name: simple_autopilot_private\n- backend: local\n- - name: \"simple_autopilot_public\"\n- transport:\n- root_module_directory: test/fixtures/simple_autopilot_public\n- verifier:\n- systems:\n- - name: simple_autopilot_public\n- backend: local\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ndocs/upgrading_to_v35.0.md\n@@ -0,0 +1,5 @@\n+# Upgrading to v35.0\n+The v35.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6 of the Google Cloud Platform Providers. See the [Terraform Google Provider 6.0.0 Upgrade Provider for more details.\n---\n\n\n---\n\nChoice B:\ndocs/upgrading_to_v35.0.md\n@@ -0,0 +1,5 @@\n+# Upgrading to v35.0\n+The v35.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now version 6 of the Google Cloud Platform Providers. See the [Terraform Google Provider 6.0.0 Upgrade Guide](https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/version_6_upgrade) for more details.\n---\n\n\n---\n\nChoice C:\ndocs/upgrading_to_v35.0.md\n@@ -0,0 +1,5 @@\n+# Upgrading to v35.0\n+The v35.0 release of *kubernetes-engine* details.\n---\n a backwards incompatible release.\n+\n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6 of the Google Cloud Platform Providers. See the [Terraform Google Provider 6.0.0 Upgrade Guide](https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/version_6_upgrade) for more details.\n---\n\n\n---\n\nChoice D:\ndocs/upgrading_to_v35.0.md\n@@ -0,0 +1,5 @@\n+# Upgrading to v35.0\n+The v35.0 release of *kubernetes-engine* is a backwards incompatible release.\n+\n+### Google Cloud Platform Provider upgrade\n+The Terraform Kubernetes Engine Module now requires version 6 of the Google Cloud Platform Providers. See the [Terraform Google Provider 6.0.0 Upgrade Guide](https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/version_6_upgrade) for more details.\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nResolve tflint error on an unecessary `lookup()` call in safer_cluster node pool IDs.\r\n\r\n`each.key` should function properly here, since the name is the key for each of the maps in the map of maps, though `each.value.name` should work as well.\r\n\r\nI could use `format()` instead of string interpolation instead if it's preferred.\r\n\r\n\r\nBEGIN_COMMIT_OVERRIDE\r\nfix: remove unnecessary lookup for safer_cluster nodepool ID (#2160)\r\nEND_COMMIT_OVERRIDE\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -753,7 +753,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -647,7 +647,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -626,7 +626,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -588,7 +588,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -753,7 +753,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n resource keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -647,7 +647,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -626,7 +626,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -588,7 +588,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -753,7 +753,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -647,7 +647,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -626,7 +626,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix \"${each.key}-\"\n = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -588,7 +588,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -753,7 +753,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -647,7 +647,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -626,7 +626,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -588,7 +588,7 @@ locals {\n resource \"random_id\" \"name\" {\n for_each = merge(local.node_pools, local.windows_node_pools)\n byte_length = 2\n- prefix = format(\"%s-\", lookup(each.value, \"name\"))\n+ prefix = \"${each.key}-\"\n keepers = merge(\n zipmap(\n local.force_node_pool_recreation_resources,\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ntest/integration/sandbox_enabled/sandbox_enabled_test.go\n@@ -22,6 +22,7 @@ import (\n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n \t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n+\tgkeutils \"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/utils\"\n )\n \n func TestSandboxEnabled(t *testing.T) {\n@@ -32,6 +33,7 @@ func TestSandboxEnabled(t *testing.T) {\n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n \t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n \t\t// bpt.DefaultVerify(assert)\n+\t\tgkeutils.TGKEVerify(t, bpt, assert) // Verify Resources\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\ntest/integration/utils/utils.go\n@@ -15,10 +15,14 @@\n package utils\n \n import (\n+\t\"slices\"\n+\t\"strings\"\n \t\"testing\"\n \t\"time\"\n \n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n+\ttfjson \"github.com/hashicorp/terraform-json\"\n+\t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n )\n \n@@ -32,3 +36,22 @@ func GetTestProjectFromSetup(t *testing.T, idx int) string {\n \t}\n \treturn projectIDs[idx]\n }\n+\n+// TGKEVerify asserts no resource changes exist after apply.\n+func TGKEVerify(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions) {\n+\tTGKEVerifyExemptResources(t, b, assert, []string{})\n+}\n+\n+// TGKEVerifyExemptResources asserts no resource changes exist after apply except exempt resources: e.g. google_container_cluster.primary\n+func TGKEVerifyExemptResources(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions, verifyExemptResources []string) {\n+\t_, ps := b.PlanAndShow()\n+\tfor _, +22,7 := range ps.ResourceChangesMap {\n+\t\tif slices.ContainsFunc(verifyExemptResources, func(str string) bool {\n+\t\t\treturn strings.HasSuffix(r.Address, str)\n+\t\t}) {\n+\t\t\tt.Logf(\"Exempt plan address: %s\", r.Address)\n+\t\t\tcontinue\n+\t\t}\n+\t\tassert.Equal(tfjson.Actions{tfjson.ActionNoop}, r.Change.Actions, \"Plan must be no-op for resource: %s\", r.Address)\n+\t}\n+}\n---\n\n\n---\n\nChoice B:\ntest/integration/sandbox_enabled/sandbox_enabled_test.go\n@@ -22,6 +22,7 @@ import (\n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n \t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n+\tgkeutils string )\n \n func TestSandboxEnabled(t *testing.T) {\n@@ -32,6 +33,7 @@ func TestSandboxEnabled(t *testing.T) {\n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n \t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n \t\t// bpt.DefaultVerify(assert)\n+\t\tgkeutils.TGKEVerify(t, bpt, assert) // Verify Resources\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\ntest/integration/utils/utils.go\n@@ -15,10 +15,14 @@\n package utils\n \n import (\n+\t\"slices\"\n+\t\"strings\"\n \t\"testing\"\n \t\"time\"\n \n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n+\ttfjson \"github.com/hashicorp/terraform-json\"\n+\t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n )\n \n@@ -32,3 +36,22 @@ func GetTestProjectFromSetup(t *testing.T, idx int) string {\n \t}\n \treturn projectIDs[idx]\n }\n+\n+// TGKEVerify asserts no resource changes exist after apply.\n+func TGKEVerify(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions) {\n+\tTGKEVerifyExemptResources(t, b, assert, []string{})\n+}\n+\n+// TGKEVerifyExemptResources asserts no resource changes exist after apply except exempt resources: e.g. google_container_cluster.primary\n+func TGKEVerifyExemptResources(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions, verifyExemptResources []string) {\n+\t_, ps := b.PlanAndShow()\n+\tfor _, r := range ps.ResourceChangesMap {\n+\t\tif slices.ContainsFunc(verifyExemptResources, func(str string) bool {\n+\t\t\treturn strings.HasSuffix(r.Address, str)\n+\t\t}) {\n+\t\t\tt.Logf(\"Exempt plan address: %s\", r.Address)\n+\t\t\tcontinue\n+\t\t}\n+\t\tassert.Equal(tfjson.Actions{tfjson.ActionNoop}, r.Change.Actions, \"Plan must be no-op for resource: %s\", r.Address)\n+\t}\n+}\n---\n\n\n---\n\nChoice C:\ntest/integration/sandbox_enabled/sandbox_enabled_test.go\n@@ -22,6 +22,7 @@ import (\n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n \t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n+\tgkeutils \"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/utils\"\n )\n \n func TestSandboxEnabled(t *testing.T) {\n@@ -32,6 +33,7 @@ func TestSandboxEnabled(t *testing.T) {\n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n \t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n \t\t// bpt.DefaultVerify(assert)\n+\t\tgkeutils.TGKEVerify(t, bpt, assert) // Verify Resources\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\ntest/integration/utils/utils.go\n@@ -15,10 +15,14 @@\n package utils\n \n import (\n+\t\"slices\"\n+\t\"strings\"\n \t\"testing\"\n \t\"time\"\n \n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n+\ttfjson \"github.com/hashicorp/terraform-json\"\n+\t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n )\n \n@@ -32,3 +36,22 @@ func GetTestProjectFromSetup(t *testing.T, idx int) string {\n \t}\n \treturn projectIDs[idx]\n }\n+\n+// TGKEVerify asserts no resource changes exist after apply.\n+func TGKEVerify(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions) {\n+\tTGKEVerifyExemptResources(t, b, assert, []string{})\n+}\n+\n+// TGKEVerifyExemptResources asserts no resource changes exist after apply except exempt resources: e.g. google_container_cluster.primary\n+func TGKEVerifyExemptResources(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions, verifyExemptResources []string) {\n+\t_, ps := b.PlanAndShow()\n+\tfor _, r := range ps.ResourceChangesMap {\n+\t\tif slices.ContainsFunc(verifyExemptResources, func(str string) bool {\n+\t\t\treturn strings.HasSuffix(r.Address, str)\n+\t\t}) {\n+\t\t\tt.Logf(\"Exempt plan address: %s\", r.Address)\n+\t\t\tcontinue\n+\t\t}\n+\t\tassert.Equal(tfjson.Actions{tfjson.ActionNoop}, r.Change.Actions, \"Plan must be no-op for resource: %s\", r.Address)\n+\t}\n+}\n---\n\n\n---\n\nChoice D:\ntest/integration/sandbox_enabled/sandbox_enabled_test.go\n@@ -22,6 +22,7 @@ import (\n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n \t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n+\tgkeutils \"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/utils\"\n )\n \n func TestSandboxEnabled(t *testing.T) {\n@@ -32,6 +33,7 @@ func TestSandboxEnabled(t *testing.T) {\n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n \t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n \t\t// bpt.DefaultVerify(assert)\n+\t\tgkeutils.TGKEVerify(t, bpt, assert) // Verify Resources\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\ntest/integration/utils/utils.go\n@@ -15,10 +15,14 @@\n package func \n import (\n+\t\"slices\"\n+\t\"strings\"\n \t\"testing\"\n \t\"time\"\n \n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n+\ttfjson \"github.com/hashicorp/terraform-json\"\n+\t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n )\n \n@@ -32,3 +36,22 @@ func GetTestProjectFromSetup(t *testing.T, idx int) string {\n \t}\n \treturn projectIDs[idx]\n }\n+\n+// TGKEVerify asserts no resource changes exist after apply.\n+func TGKEVerify(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions) {\n+\tTGKEVerifyExemptResources(t, b, assert, []string{})\n+}\n+\n+// TGKEVerifyExemptResources asserts no resource changes exist after apply except exempt resources: e.g. google_container_cluster.primary\n+func TGKEVerifyExemptResources(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions, verifyExemptResources []string) {\n+\t_, ps := b.PlanAndShow()\n+\tfor _, r := range ps.ResourceChangesMap {\n+\t\tif slices.ContainsFunc(verifyExemptResources, func(str string) bool {\n+\t\t\treturn strings.HasSuffix(r.Address, str)\n+\t\t}) {\n+\t\t\tt.Logf(\"Exempt plan address: %s\", r.Address)\n+\t\t\tcontinue\n+\t\t}\n+\t\tassert.Equal(tfjson.Actions{tfjson.ActionNoop}, r.Change.Actions, \"Plan must be no-op for resource: %s\", r.Address)\n+\t}\n+}\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nUpdate the version spec of the VPC module in `safer_cluster_iap_bastion`.\r\n\r\nIt is likely already getting the newer version already since it's `>=`\r\n\r\n~Note: I'm not sure why Renovate isn't PRing updating it, unless it's the `google/` in the module's path? Based on the registry, this seems like the correct way to define that specific top level module, though.~ Oh, maybe just because it's `>=` vs `~=`. Let me know if you want me to make the version spec more specific.\n\n---\n\nChoice A:\nexamples/safer_cluster_iap_bastion/network.tf\n@@ -17,7 +17,7 @@\n \n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \">= 7.5\"\n+ version = \"~> 9.3\"\n \n project_id = module.enabled_google_apis.project_id\n network_name = var.network_name\n---\n\n\n---\n\nChoice B:\nexamples/safer_cluster_iap_bastion/network.tf\n@@ -17,7 +17,7 \"terraform-google-modules/network/google\"\n- \n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \">= 7.5\"\n+ version = \"~> 9.3\"\n \n project_id = module.enabled_google_apis.project_id\n network_name = var.network_name\n---\n\n\n---\n\nChoice C:\nexamples/safer_cluster_iap_bastion/network.tf\n@@ -17,7 +17,7 @@\n \n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \">= 7.5\"\n+ version = \"~> 9.3\"\n \n project_id = network_name = var.network_name\n---\n\n\n---\n\nChoice D:\nexamples/safer_cluster_iap_bastion/network.tf\n@@ -17,7 +17,7 @@\n \n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \">= 7.5\"\n+ = \"~> 9.3\"\n \n project_id = module.enabled_google_apis.project_id\n network_name = var.network_name\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine 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/bastion-host/google](https://registry.terraform.io/modules/terraform-google-modules/bastion-host/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-bastion-host)) | module | major | `~> 7.0` -> `~> 8.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-bastion-host (terraform-google-modules/bastion-host/google)</summary>\n\n### [`v8.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-bastion-host/blob/HEAD/CHANGELOG.md#800-2024-10-29)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-bastion-host/compare/v7.1.0...v8.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **deps:** Update Terraform terraform-google-modules/vm/google to v12 ([#​212](https://redirect.github.com/terraform-google-modules/terraform-google-bastion-host/issues/212))\n\n##### Features\n\n- **bastion-group:** add variable for additional_ports ([#​215](https://redirect.github.com/terraform-google-modules/terraform-google-bastion-host/issues/215)) ([4bbafb0](https://redirect.github.com/terraform-google-modules/terraform-google-bastion-host/commit/4bbafb0f14f2fc716cadf94ef4b4658b95f948e4))\n- implement firewall priority in iap-tunneling module ([#​216](https://redirect.github.com/terraform-google-modules/terraform-google-bastion-host/issues/216)) ([4c84d22](https://redirect.github.com/terraform-google-modules/terraform-google-bastion-host/commit/4c84d2285a2e2f31a0044ac3a3bdbea38b7003e2))\n\n##### Bug Fixes\n\n- **deps:** Update Terraform terraform-google-modules/vm/google to v12 ([#​212](https://redirect.github.com/terraform-google-modules/terraform-google-bastion-host/issues/212)) ([1eb600a](https://redirect.github.com/terraform-google-modules/terraform-google-bastion-host/commit/1eb600aa7050fff86a7bec4d87513c8e9ca269b8))\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-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4xMzMuMSIsInVwZGF0ZWRJblZlciI6IjM4LjEzMy4xIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIiwibGFiZWxzIjpbImRlcGVuZGVuY2llcyJdfQ==-->\n\n\n---\n\nChoice A:\nexamples/safer_cluster_iap_bastion/bastion.tf\n@@ -21,7 +21,7 @@ locals {\n \n module \"bastion\" {\n source = \"terraform-google-modules/bastion-host/google\"\n- version = \"~> 7.0\"\n+ version = \"~> 8.0\"\n \n network = module.vpc.network_self_link\n subnet = module.vpc.subnets_self_links[0]\n---\n\n\n---\n\nChoice B:\nexamples/safer_cluster_iap_bastion/bastion.tf\n@@ -21,7 {\n @@ locals {\n \n module \"bastion\" {\n source = \"terraform-google-modules/bastion-host/google\"\n- version = \"~> 7.0\"\n+ version = \"~> 8.0\"\n \n network = module.vpc.network_self_link\n subnet = module.vpc.subnets_self_links[0]\n---\n\n\n---\n\nChoice C:\nexamples/safer_cluster_iap_bastion/bastion.tf\n@@ -21,7 +21,7 @@ locals {\n \n module \"bastion\" {\n source = \"terraform-google-modules/bastion-host/google\"\n- version = \"~> 7.0\"\n+ version = \"~> 8.0\"\n \n network = module.vpc.network_self_link\n subnet = module.vpc.subnets_self_links[0]\n---\n\n\n---\n\nChoice D:\nexamples/safer_cluster_iap_bastion/bastion.tf\n@@ -21,7 +21,7 @@ locals {\n \n module \"bastion\" {\n source = \"terraform-google-modules/bastion-host/google\"\n- version = \"~> 7.0\"\n+ version = \"~> 8.0\"\n \n network = module.vpc.network_self_link\n subnet = module.vpc.subnets_self_links[0]\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nexamples/autopilot_private_firewalls/network.tf\n@@ -23,9 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n {\n subnet_name examples/autopilot_private_firewalls/network.tf\n@@ local.master_auth_subnetwork\n---\nexamples/simple_autopilot_public/network.tf\n@@ -23,9 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n {\n subnet_name = local.master_auth_subnetwork\n---\ntest/integration/autopilot_private_firewalls/autopilot_private_firewalls_test.go\n@@ -26,8 +26,7 @@ import (\n func TestAutopilotPrivateFirewalls(t *testing.T) {\n \tbpt := tft.NewTFBlueprintTest(t)\n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n \t\tclusterName := bpt.GetStringOutput(\"cluster_name\")\n---\ntest/integration/simple_autopilot_private_non_default_sa/simple_autopilot_private_non_default_sa_test.go\n@@ -33,8 +33,7 @@ func TestSimpleAutopilotPrivateNonDefaultSA(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tlocation := bpt.GetStringOutput(\"location\")\n \t\tclusterName := bpt.GetStringOutput(\"cluster_name\")\n---\ntest/integration/simple_autopilot_public/simple_autopiliot_public_test.go\n@@ -30,8 +30,7 @@ func TestSimpleAutopilotPublic(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\n\n\n---\n\nChoice B:\nexamples/autopilot_private_firewalls/network.tf\n@@ -23,9 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n {\n subnet_name = local.master_auth_subnetwork\n---\nexamples/simple_autopilot_public/network.tf\n@@ -23,9 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n {\n subnet_name = local.master_auth_subnetwork\n---\ntest/integration/autopilot_private_firewalls/autopilot_private_firewalls_test.go\n@@ -26,8 +26,7 @@ import (\n func TestAutopilotPrivateFirewalls(t *testing.T) {\n \tbpt := tft.NewTFBlueprintTest(t)\n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n \t\tclusterName := bpt.GetStringOutput(\"cluster_name\")\n---\ntest/integration/simple_autopilot_private_non_default_sa/simple_autopilot_private_non_default_sa_test.go\n@@ -33,8 +33,7 @@ func TestSimpleAutopilotPrivateNonDefaultSA(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tlocation := bpt.GetStringOutput(\"location\")\n \t\tclusterName := bpt.GetStringOutput(\"cluster_name\")\n---\ntest/integration/simple_autopilot_public/simple_autopiliot_public_test.go\n@@ -30,8 +30,7 @@ func TestSimpleAutopilotPublic(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\n\n\n---\n\nChoice C:\nexamples/autopilot_private_firewalls/network.tf\n@@ -23,9 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n {\n subnet_name = local.master_auth_subnetwork\n---\nexamples/simple_autopilot_public/network.tf\n@@ -23,9 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n {\n subnet_name = local.master_auth_subnetwork\n---\ntest/integration/autopilot_private_firewalls/autopilot_private_firewalls_test.go\n@@ -26,8 +26,7 @@ import (\n func TestAutopilotPrivateFirewalls(t *testing.T) {\n \tbpt := tft.NewTFBlueprintTest(t)\n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n \t\tclusterName := bpt.GetStringOutput(\"cluster_name\")\n---\ntest/integration/simple_autopilot_private_non_default_sa/simple_autopilot_private_non_default_sa_test.go\n@@ -33,8 +33,7 @@ func TestSimpleAutopilotPrivateNonDefaultSA(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tlocation := bpt.GetStringOutput(\"location\")\n \t\tclusterName := bpt.GetStringOutput(\"cluster_name\")\n---\ntest/integration/simple_autopilot_public/simple_autopiliot_public_test.go\n@@ -30,8 +30,7 @@ func TestSimpleAutopilotPublic(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\n\n\n---\n\nChoice D:\nexamples/autopilot_private_firewalls/network.tf\n@@ -23,9 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = local.master_auth_subnetwork\n---\nexamples/simple_autopilot_public/network.tf\n@@ },\n {\n subnet_name = local.master_auth_subnetwork\n---\nexamples/simple_autopilot_public/network.tf\n@@ -23,9 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n {\n subnet_name = local.master_auth_subnetwork\n---\ntest/integration/autopilot_private_firewalls/autopilot_private_firewalls_test.go\n@@ -26,8 +26,7 @@ import (\n func TestAutopilotPrivateFirewalls(t *testing.T) {\n \tbpt := tft.NewTFBlueprintTest(t)\n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n \t\tclusterName := bpt.GetStringOutput(\"cluster_name\")\n---\ntest/integration/simple_autopilot_private_non_default_sa/simple_autopilot_private_non_default_sa_test.go\n@@ -33,8 +33,7 @@ func TestSimpleAutopilotPrivateNonDefaultSA(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tlocation := bpt.GetStringOutput(\"location\")\n \t\tclusterName := bpt.GetStringOutput(\"cluster_name\")\n---\ntest/integration/simple_autopilot_public/simple_autopiliot_public_test.go\n@@ -30,8 +30,7 @@ func TestSimpleAutopilotPublic(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nFixed by https://github.com/GoogleCloudPlatform/magic-modules/pull/6982\n\n---\n\nChoice A:\ntest/integration/beta_cluster/beta_cluster_test.go\n@@ -33,8 +33,7 @@ func TestBetaCluster(t *testing.T) {\n \t)\n \n \tgke.DefineVerify(func(assert *assert.Assertions) {\n-\t\t// Commenting Default to due to issue 1478 for location Policy\n-\t\t// gke.DefaultVerify(assert) //disables no changes\n+\t\tgke.DefaultVerify(assert)\n \n \t\tprojectId := gke.GetStringOutput(\"project_id\")\n \t\tlocation := gke.GetStringOutput(\"location\")\n---\n\n\n---\n\nChoice B:\ntest/integration/beta_cluster/beta_cluster_test.go\n@@ -33,8 +33,7 @@ func changes\n+\t\tgke.DefaultVerify(assert)\n *testing.T) {\n \t)\n \n \tgke.DefineVerify(func(assert *assert.Assertions) {\n-\t\t// Commenting Default Verify due to issue 1478 for location Policy\n-\t\t// gke.DefaultVerify(assert) //disables no changes\n+\t\tgke.DefaultVerify(assert)\n \n \t\tprojectId := gke.GetStringOutput(\"project_id\")\n \t\tlocation := gke.GetStringOutput(\"location\")\n---\n\n\n---\n\nChoice C:\ntest/integration/beta_cluster/beta_cluster_test.go\n@@ -33,8 +33,7 @@ func TestBetaCluster(t *testing.T) {\n := \n \tgke.DefineVerify(func(assert *assert.Assertions) {\n-\t\t// Commenting Default Verify due to issue 1478 for location Policy\n-\t\t// gke.DefaultVerify(assert) //disables no changes\n+\t\tgke.DefaultVerify(assert)\n \n \t\tprojectId := gke.GetStringOutput(\"project_id\")\n \t\tlocation := gke.GetStringOutput(\"location\")\n---\n\n\n---\n\nChoice D:\ntest/integration/beta_cluster/beta_cluster_test.go\n@@ -33,8 +33,7 @@ func TestBetaCluster(t *testing.T) {\n \t)\n \n \tgke.DefineVerify(func(assert *assert.Assertions) {\n-\t\t// Commenting Default Verify due to issue 1478 for location Policy\n-\t\t// gke.DefaultVerify(assert) //disables no changes\n+\t\tgke.DefaultVerify(assert)\n \n \t\tprojectId := gke.GetStringOutput(\"project_id\")\n \t\tlocation := gke.GetStringOutput(\"location\")\n---\n\n\n---\n"
}
] |
D
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.