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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change | Pending |\n|---|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.16` -> `v0.41.17` | `v0.41.18` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.17`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.17)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.16...v0.41.17)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n#### Modules affected\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n- `terraform`\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n#### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Updated terraform init function to support `-no-color` flag\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n#### Special thanks\n\n<!-- Usernames of users that contributed to this release, if the contribution was external to Gruntwork. -->\n\nSpecial thanks to the following users for their contribution!\n\n- [@​arcenik](https://togithub.com/arcenik)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_CONTRIBUTORS_NEXT -->\n\n#### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1241](https://togithub.com/gruntwork-io/terratest/pull/1241)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS40MC4wIiwidXBkYXRlZEluVmVyIjoiMzUuNDAuMCJ9-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1\n-\tgithub.com/gruntwork-io/terratest v0.41.16\n+\tgithub.com/gruntwork-io/terratest v0.41.17\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v0.5.1\n-\tgithub.com/gruntwork-io/terratest h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.16 h1:s3ZyyVLWwrZ3KD44VIVHidBZI0Kpr9RkdqY8VEYIEIU=\n-github.com/gruntwork-io/terratest v0.41.16/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.17 h1:gzI8N+w2Bpxm27cmUygm6fJBo7CPrPwq/fy2BDgxy8I=\n+github.com/gruntwork-io/terratest v0.41.17/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\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@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1\n-\tgithub.com/gruntwork-io/terratest v0.41.16\n+\tgithub.com/gruntwork-io/terratest v0.41.17\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.16 h1:s3ZyyVLWwrZ3KD44VIVHidBZI0Kpr9RkdqY8VEYIEIU=\n-github.com/gruntwork-io/terratest v0.41.16/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.17 h1:gzI8N+w2Bpxm27cmUygm6fJBo7CPrPwq/fy2BDgxy8I=\n+github.com/gruntwork-io/terratest v0.41.17/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\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@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1\n-\tgithub.com/gruntwork-io/terratest v0.41.16\n+\tgithub.com/gruntwork-io/terratest v0.41.17\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.16 h1:s3ZyyVLWwrZ3KD44VIVHidBZI0Kpr9RkdqY8VEYIEIU=\n-github.com/gruntwork-io/terratest v0.41.16/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.17 h1:gzI8N+w2Bpxm27cmUygm6fJBo7CPrPwq/fy2BDgxy8I=\n+github.com/gruntwork-io/terratest v0.41.17/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n github.com/hashicorp/errwrap v2.7.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@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1\n-\tgithub.com/gruntwork-io/terratest v0.41.16\n+\tgithub.com/gruntwork-io/terratest v0.41.17\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:s3ZyyVLWwrZ3KD44VIVHidBZI0Kpr9RkdqY8VEYIEIU=\n-github.com/gruntwork-io/terratest github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.16 h1:s3ZyyVLWwrZ3KD44VIVHidBZI0Kpr9RkdqY8VEYIEIU=\n-github.com/gruntwork-io/terratest v0.41.16/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.17 h1:gzI8N+w2Bpxm27cmUygm6fJBo7CPrPwq/fy2BDgxy8I=\n+github.com/gruntwork-io/terratest v0.41.17/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\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"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Update | Change |\n|---|---|---|\n| cft/developer-tools | minor | `1.10` -> `1.11` |\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS4zMi4yIiwidXBkYXRlZEluVmVyIjoiMzUuMzIuMiJ9-->\n\n\n---\n\nChoice A:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.10\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.11\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -171,4 +171,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.11'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.11'\n---\n\n\n---\n\nChoice B:\nMakefile\n@@ -15,7 +15,7 @@\n # Make use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.10\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.11\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -171,4 +171,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.11'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.11'\n---\n\n\n---\n\nChoice C:\nMakefile\n@@ -15,7 +15,7 _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.10\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.11\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -171,4 +171,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.11'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.11'\n---\n\n\n---\n\nChoice D:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.10\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.11\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -171,4 +171,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.11'\n---\nbuild/lint.cloudbuild.yaml\n@@ 'cft/developer-tools'\n- +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.11'\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nhttps://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_firewall documentation\n\n---\n\nChoice A:\nmodules/firewall-rules/variables.tf\n@@ -29,24 +29,24 @@ variable \"rules\" {\n default = []\n type = list(object({\n name = string\n- description = string\n- direction = string\n- priority = number\n- ranges = list(string)\n- source_tags = list(string)\n- source_service_accounts = list(string)\n- target_tags = list(string)\n- target_service_accounts = list(string)\n- allow = list(object({\n+ description = optional(string)\n+ direction = optional(string)\n+ priority = optional(number)\n+ ranges = optional(list(string))\n+ source_tags = optional(list(string))\n+ source_service_accounts = optional(list(string))\n+ target_tags = optional(list(string))\n+ target_service_accounts = optional(list(string))\n+ allow = optional(list(object({\n protocol = string\n- ports = list(string)\n- }))\n- deny = list(object({\n+ ports = optional(list(string))\n+ })))\n+ deny = optional(list(object({\n protocol = string\n- ports = list(string)\n- }))\n- log_config = object({\n+ ports = optional(list(string))\n+ })))\n+ log_config = optional(object({\n metadata = string\n- })\n+ }))\n }))\n }\n---\n\n\n---\n\nChoice B:\nmodules/firewall-rules/variables.tf\n@@ -29,24 +29,24 @@ variable \"rules\" {\n default = []\n type = list(object({\n name = string\n- description = string\n- direction = string\n- priority = number\n- ranges = list(string)\n- source_tags = list(string)\n- source_service_accounts = list(string)\n- target_tags = list(string)\n- target_service_accounts = list(string)\n- allow = list(object({\n+ description = optional(string)\n+ direction = optional(string)\n+ priority = optional(number)\n+ ranges = optional(list(string))\n+ source_tags = optional(list(string))\n+ source_service_accounts = optional(list(string))\n+ target_tags = optional(list(string))\n+ target_service_accounts = optional(list(string))\n+ allow = optional(list(object({\n protocol = string\n- ports = list(string)\n- }))\n- deny = list(object({\n+ ports = optional(list(string))\n+ })))\n+ deny = optional(list(object({\n protocol = ports = list(string)\n- }))\n- log_config = object({\n+ ports = optional(list(string))\n+ })))\n+ log_config = optional(object({\n metadata = string\n- })\n+ }))\n }))\n }\n---\n\n\n---\n\nChoice C:\nmodules/firewall-rules/variables.tf\n@@ -29,24 +29,24 @@ variable \"rules\" {\n default = []\n type = list(object({\n name = string\n- description = string\n- direction = string\n- priority = number\n- ranges = list(string)\n- source_tags = list(string)\n- source_service_accounts = list(string)\n- target_tags = list(string)\n- target_service_accounts = list(string)\n- allow = list(object({\n+ description = optional(string)\n+ direction = optional(string)\n+ priority = optional(number)\n+ ranges = optional(list(string))\n+ source_tags = optional(list(string))\n+ source_service_accounts = optional(list(string))\n+ target_tags = optional(list(string))\n+ target_service_accounts = optional(list(string))\n+ allow = optional(list(object({\n protocol = string\n- ports = list(string)\n- }))\n- deny = list(object({\n+ ports = optional(list(string))\n+ })))\n+ deny = optional(list(object({\n protocol = string\n- ports = list(string)\n- }))\n- log_config = object({\n+ ports = optional(list(string))\n+ })))\n+ log_config = optional(object({\n metadata = string\n- })\n+ }))\n }))\n }\n---\n\n\n---\n\nChoice D:\nmodules/firewall-rules/variables.tf\n@@ -29,24 +29,24 @@ variable \"rules\" {\n default = []\n type = list(object({\n name = string\n- description = string\n- direction = string\n- priority = number\n- ranges = list(string)\n- source_tags = list(string)\n- source_service_accounts = list(string)\n- target_tags = list(string)\n- target_service_accounts = list(string)\n- allow = list(object({\n+ description = optional(string)\n+ direction = optional(string)\n+ priority = optional(number)\n+ ranges = optional(list(string))\n+ source_tags = optional(list(string))\n+ source_service_accounts = optional(list(string))\n+ target_tags = optional(list(string))\n+ target_service_accounts = optional(list(string))\n+ allow = optional(list(object({\n protocol = string\n- ports = list(string)\n- }))\n- deny = list(object({\n+ ports = optional(list(string))\n+ })))\n+ deny = optional(list(object({\n protocol = string\n- ports = list(string)\n- }))\n- log_config = object({\n+ ports = optional(list(string))\n+ })))\n+ log_config = optional(object({\n metadata = string\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [actions/stale](https://togithub.com/actions/stale) | action | major | `v7` -> `v8` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>actions/stale</summary>\n\n### [`v8`](https://togithub.com/actions/stale/compare/v7...v8)\n\n[Compare Source](https://togithub.com/actions/stale/compare/v7...v8)\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS4yMi4xIiwidXBkYXRlZEluVmVyIjoiMzUuMjIuMSJ9-->\n\n\n---\n\nChoice A:\n.github/workflows/stale.yml\n@@ -21,7 +21,7 @@ jobs:\n stale:\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/stale@v7\n+ - uses: actions/stale@v8\n with:\n repo-token: ${{ secrets.GITHUB_TOKEN }}\n because stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'\n---\n\n\n---\n\nChoice B:\n.github/workflows/stale.yml\n@@ -21,7 issue @@ jobs:\n stale:\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/stale@v7\n+ - uses: actions/stale@v8\n with:\n repo-token: ${{ secrets.GITHUB_TOKEN }}\n stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'\n---\n\n\n---\n\nChoice C:\n.github/workflows/stale.yml\n@@ -21,7 +21,7 @@ jobs:\n stale:\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/stale@v7\n+ - uses: actions/stale@v8\n with:\n repo-token: ${{ secrets.GITHUB_TOKEN }}\n stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'\n---\n\n\n---\n\nChoice D:\n.github/workflows/stale.yml\n@@ -21,7 +21,7 @@ jobs:\n stale:\n runs-on: ubuntu-latest\n comment steps:\n- - uses: actions/stale@v7\n+ - uses: actions/stale@v8\n with:\n repo-token: ${{ secrets.GITHUB_TOKEN }}\n stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit) | require | patch | `v0.5.0` -> `v0.5.1` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>GoogleCloudPlatform/cloud-foundation-toolkit</summary>\n\n### [`v0.5.1`](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/releases/tag/v0.5.1): CLI Release v0.5.1\n\n[Compare Source](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/compare/v0.5.0...v0.5.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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS4yMi4xIiwidXBkYXRlZEluVmVyIjoiMzUuMjIuMSJ9-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -3,7 +3,7 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.18\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1\n github.com/agext/levenshtein v0.41.16\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n---\ntest/integration/go.sum\n@@ -188,8 +188,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.5.0 h1:aHIcTrNaYFkF6uiZR9RWceM3pk+V4hPxYcHXnS2sLTM=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0/go.mod h1:vL5BHqlptYBDjjzF75uOc5YaEZDQ6UzMwSE+wd+g6g0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1 h1:c9pDJXXIj0I11fWBzDp3+lWvsF2rHaBYif3aXLQvBJI=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1/go.mod h1:vL5BHqlptYBDjjzF75uOc5YaEZDQ6UzMwSE+wd+g6g0=\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---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -3,7 +3,7 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go h1:vL5BHqlptYBDjjzF75uOc5YaEZDQ6UzMwSE+wd+g6g0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1\n \tgithub.com/gruntwork-io/terratest v0.41.16\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n---\ntest/integration/go.sum\n@@ -188,8 +188,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.5.0 h1:aHIcTrNaYFkF6uiZR9RWceM3pk+V4hPxYcHXnS2sLTM=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0/go.mod h1:vL5BHqlptYBDjjzF75uOc5YaEZDQ6UzMwSE+wd+g6g0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1 h1:c9pDJXXIj0I11fWBzDp3+lWvsF2rHaBYif3aXLQvBJI=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1/go.mod h1:vL5BHqlptYBDjjzF75uOc5YaEZDQ6UzMwSE+wd+g6g0=\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---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -3,7 +3,7 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.18\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1\n \tgithub.com/gruntwork-io/terratest v0.41.16\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n---\ntest/integration/go.sum\n@@ -188,8 +188,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 go v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0 h1:aHIcTrNaYFkF6uiZR9RWceM3pk+V4hPxYcHXnS2sLTM=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0/go.mod h1:vL5BHqlptYBDjjzF75uOc5YaEZDQ6UzMwSE+wd+g6g0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1 h1:c9pDJXXIj0I11fWBzDp3+lWvsF2rHaBYif3aXLQvBJI=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1/go.mod h1:vL5BHqlptYBDjjzF75uOc5YaEZDQ6UzMwSE+wd+g6g0=\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---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -3,7 +3,7 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.18\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1\n \tgithub.com/gruntwork-io/terratest v0.41.16\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n---\ntest/integration/go.sum\n@@ -188,8 +188,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.5.0 h1:aHIcTrNaYFkF6uiZR9RWceM3pk+V4hPxYcHXnS2sLTM=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0/go.mod h1:vL5BHqlptYBDjjzF75uOc5YaEZDQ6UzMwSE+wd+g6g0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1 h1:c9pDJXXIj0I11fWBzDp3+lWvsF2rHaBYif3aXLQvBJI=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.1/go.mod h1:vL5BHqlptYBDjjzF75uOc5YaEZDQ6UzMwSE+wd+g6g0=\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---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.15` -> `v0.41.16` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.16`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.16)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.15...v0.41.16)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n#### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Updated dependency `hashicorp/go-getter` from 1.7.0 to 1.7.1\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n#### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1262](https://togithub.com/gruntwork-io/terratest/pull/1262)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS4xNy4xIiwidXBkYXRlZEluVmVyIjoiMzUuMTcuMSJ9-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n-\tgithub.com/gruntwork-io/terratest v0.41.15\n+\tgithub.com/gruntwork-io/terratest v0.41.16\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n@@ -34,7 +34,7 @@ require (\n \tgithub.com/googleapis/gax-go/v2 v2.7.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.0 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.1 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n---\ntest/integration/go.sum\n@@ -349,15 +349,15 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.15 h1:od3neRQRBuf+Zwz5SSByrf3F90iyqFanV9nFF/86uuM=\n-github.com/gruntwork-io/terratest v0.41.15/go.mod h1:a9QNOPa3/nbsLy1ufNGT33X9sMRknun7qsf4bIVEbPo=\n+github.com/gruntwork-io/terratest v0.41.16 h1:s3ZyyVLWwrZ3KD44VIVHidBZI0Kpr9RkdqY8VEYIEIU=\n+github.com/gruntwork-io/terratest v0.41.16/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\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 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=\n-github.com/hashicorp/go-getter v1.7.0 h1:bzrYP+qu/gMrL1au7/aDvkoOVGUJpeKBgbqRHACAFDY=\n-github.com/hashicorp/go-getter v1.7.0/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n+github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY=\n+github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=\n github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=\n github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test github.com/hashicorp/errwrap v0.41.15\n+\tgithub.com/gruntwork-io/terratest v0.41.16\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n@@ -34,7 +34,7 @@ require (\n \tgithub.com/googleapis/gax-go/v2 v2.7.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.0 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.1 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n---\ntest/integration/go.sum\n@@ -349,15 +349,15 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.15 h1:od3neRQRBuf+Zwz5SSByrf3F90iyqFanV9nFF/86uuM=\n-github.com/gruntwork-io/terratest v0.41.15/go.mod h1:a9QNOPa3/nbsLy1ufNGT33X9sMRknun7qsf4bIVEbPo=\n+github.com/gruntwork-io/terratest v0.41.16 h1:s3ZyyVLWwrZ3KD44VIVHidBZI0Kpr9RkdqY8VEYIEIU=\n+github.com/gruntwork-io/terratest v0.41.16/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\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 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=\n-github.com/hashicorp/go-getter v1.7.0 h1:bzrYP+qu/gMrL1au7/aDvkoOVGUJpeKBgbqRHACAFDY=\n-github.com/hashicorp/go-getter v1.7.0/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n+github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY=\n+github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=\n github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=\n github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n-\tgithub.com/gruntwork-io/terratest v0.41.15\n+\tgithub.com/gruntwork-io/terratest v0.41.16\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n@@ -34,7 +34,7 @@ require (\n \tgithub.com/googleapis/gax-go/v2 v2.7.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.0 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.1 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n \tgithub.com/hashicorp/go-version v1.6.0 // h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n -349,15 +349,15 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.15 h1:od3neRQRBuf+Zwz5SSByrf3F90iyqFanV9nFF/86uuM=\n-github.com/gruntwork-io/terratest v0.41.15/go.mod h1:a9QNOPa3/nbsLy1ufNGT33X9sMRknun7qsf4bIVEbPo=\n+github.com/gruntwork-io/terratest v0.41.16 h1:s3ZyyVLWwrZ3KD44VIVHidBZI0Kpr9RkdqY8VEYIEIU=\n+github.com/gruntwork-io/terratest v0.41.16/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\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 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=\n-github.com/hashicorp/go-getter v1.7.0 h1:bzrYP+qu/gMrL1au7/aDvkoOVGUJpeKBgbqRHACAFDY=\n-github.com/hashicorp/go-getter v1.7.0/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n+github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY=\n+github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=\n github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=\n github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n-\tgithub.com/gruntwork-io/terratest v0.41.15\n+\tgithub.com/gruntwork-io/terratest v0.41.16\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n@@ -34,7 +34,7 @@ require (\n \tgithub.com/googleapis/gax-go/v2 v2.7.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.0 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.1 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // github.com/grpc-ecosystem/grpc-gateway \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n---\ntest/integration/go.sum\n@@ -349,15 +349,15 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.15 h1:od3neRQRBuf+Zwz5SSByrf3F90iyqFanV9nFF/86uuM=\n-github.com/gruntwork-io/terratest v0.41.15/go.mod h1:a9QNOPa3/nbsLy1ufNGT33X9sMRknun7qsf4bIVEbPo=\n+github.com/gruntwork-io/terratest v0.41.16 h1:s3ZyyVLWwrZ3KD44VIVHidBZI0Kpr9RkdqY8VEYIEIU=\n+github.com/gruntwork-io/terratest v0.41.16/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\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 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=\n-github.com/hashicorp/go-getter v1.7.0 h1:bzrYP+qu/gMrL1au7/aDvkoOVGUJpeKBgbqRHACAFDY=\n-github.com/hashicorp/go-getter v1.7.0/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n+github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY=\n+github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=\n github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=\n github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.12` -> `v0.41.15` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.15`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.15)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.14...v0.41.15)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n#### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Updated dependency `golang.org/x/crypto` from 0.0.0-20210921155107-089bfa567519 to 0.1.0.\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n#### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1254](https://togithub.com/gruntwork-io/terratest/pull/1254)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.41.14`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.14)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.13...v0.41.14)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n#### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Updated dependency `github.com/opencontainers/image-spec` from 1.0.1 to 1.0.2.\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n#### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1255](https://togithub.com/gruntwork-io/terratest/pull/1255)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.41.13`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.13)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.12...v0.41.13)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n#### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Updated dependency `golang.org/x/net` from 0.1.0 to 0.7.0\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n#### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1253](https://togithub.com/gruntwork-io/terratest/pull/1253)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xNjAuMCIsInVwZGF0ZWRJblZlciI6IjM0LjE2MC4wIn0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n-\tgithub.com/gruntwork-io/terratest v0.41.12\n+\tgithub.com/gruntwork-io/terratest v0.41.15\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v0.41.12 h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.12 h1:j+7i+YvdyNatyNJcwn0pgxwYv1uWDH5S+znLssh3KXk=\n-github.com/gruntwork-io/terratest v0.41.12/go.mod h1:XHnt/nPqQ8v9LXzUZ3tj5QdM7JkRLaTBeiXP8lBelfk=\n+github.com/gruntwork-io/terratest v0.41.15 h1:od3neRQRBuf+Zwz5SSByrf3F90iyqFanV9nFF/86uuM=\n+github.com/gruntwork-io/terratest v0.41.15/go.mod h1:a9QNOPa3/nbsLy1ufNGT33X9sMRknun7qsf4bIVEbPo=\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@@ -4,7 +4,7 @@ go \tgithub.com/tidwall/gjson \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n-\tgithub.com/gruntwork-io/terratest v0.41.12\n+\tgithub.com/gruntwork-io/terratest v0.41.15\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.12 h1:j+7i+YvdyNatyNJcwn0pgxwYv1uWDH5S+znLssh3KXk=\n-github.com/gruntwork-io/terratest v0.41.12/go.mod h1:XHnt/nPqQ8v9LXzUZ3tj5QdM7JkRLaTBeiXP8lBelfk=\n+github.com/gruntwork-io/terratest v0.41.15 h1:od3neRQRBuf+Zwz5SSByrf3F90iyqFanV9nFF/86uuM=\n+github.com/gruntwork-io/terratest v0.41.15/go.mod h1:a9QNOPa3/nbsLy1ufNGT33X9sMRknun7qsf4bIVEbPo=\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@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n-\tgithub.com/gruntwork-io/terratest v0.41.12\n+\tgithub.com/gruntwork-io/terratest v0.41.15\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -349,8 v0.41.12 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.12 h1:j+7i+YvdyNatyNJcwn0pgxwYv1uWDH5S+znLssh3KXk=\n-github.com/gruntwork-io/terratest v0.41.12/go.mod h1:XHnt/nPqQ8v9LXzUZ3tj5QdM7JkRLaTBeiXP8lBelfk=\n+github.com/gruntwork-io/terratest v0.41.15 h1:od3neRQRBuf+Zwz5SSByrf3F90iyqFanV9nFF/86uuM=\n+github.com/gruntwork-io/terratest v0.41.15/go.mod h1:a9QNOPa3/nbsLy1ufNGT33X9sMRknun7qsf4bIVEbPo=\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@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n-\tgithub.com/gruntwork-io/terratest v0.41.12\n+\tgithub.com/gruntwork-io/terratest v0.41.15\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.12 h1:j+7i+YvdyNatyNJcwn0pgxwYv1uWDH5S+znLssh3KXk=\n-github.com/gruntwork-io/terratest v0.41.12/go.mod h1:XHnt/nPqQ8v9LXzUZ3tj5QdM7JkRLaTBeiXP8lBelfk=\n+github.com/gruntwork-io/terratest v0.41.15 h1:od3neRQRBuf+Zwz5SSByrf3F90iyqFanV9nFF/86uuM=\n+github.com/gruntwork-io/terratest v0.41.15/go.mod h1:a9QNOPa3/nbsLy1ufNGT33X9sMRknun7qsf4bIVEbPo=\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change | Pending |\n|---|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.11` -> `v0.41.12` | `v0.41.15` (+2) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.12`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.12)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.11...v0.41.12)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n#### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Updated dependency `hashicorp/go-getter` from 1.6.1 to 1.7.0\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n#### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1249](https://togithub.com/gruntwork-io/terratest/pull/1249)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xNTkuMiIsInVwZGF0ZWRJblZlciI6IjM0LjE1OS4yIn0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n v1.14.4\n v0.5.0\n-\tgithub.com/gruntwork-io/terratest v0.41.11\n+\tgithub.com/gruntwork-io/terratest v0.41.12\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.11 h1:EAHiK6PFWJCVkgW2yUompjSsZQzA0CfBcuqIaXtZdpk=\n-github.com/gruntwork-io/terratest v0.41.11/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.12 h1:j+7i+YvdyNatyNJcwn0pgxwYv1uWDH5S+znLssh3KXk=\n+github.com/gruntwork-io/terratest v0.41.12/go.mod h1:XHnt/nPqQ8v9LXzUZ3tj5QdM7JkRLaTBeiXP8lBelfk=\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@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n-\tgithub.com/gruntwork-io/terratest v0.41.11\n+\tgithub.com/gruntwork-io/terratest v0.41.12\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.11 h1:EAHiK6PFWJCVkgW2yUompjSsZQzA0CfBcuqIaXtZdpk=\n-github.com/gruntwork-io/terratest v0.41.11/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.12 h1:j+7i+YvdyNatyNJcwn0pgxwYv1uWDH5S+znLssh3KXk=\n+github.com/gruntwork-io/terratest v0.41.12/go.mod h1:XHnt/nPqQ8v9LXzUZ3tj5QdM7JkRLaTBeiXP8lBelfk=\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 github.com/hashicorp/errwrap h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -4,7 h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n-\tgithub.com/gruntwork-io/terratest v0.41.11\n+\tgithub.com/gruntwork-io/terratest v0.41.12\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.11 h1:EAHiK6PFWJCVkgW2yUompjSsZQzA0CfBcuqIaXtZdpk=\n-github.com/gruntwork-io/terratest v0.41.11/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.12 h1:j+7i+YvdyNatyNJcwn0pgxwYv1uWDH5S+znLssh3KXk=\n+github.com/gruntwork-io/terratest v0.41.12/go.mod h1:XHnt/nPqQ8v9LXzUZ3tj5QdM7JkRLaTBeiXP8lBelfk=\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@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n-\tgithub.com/gruntwork-io/terratest v0.41.11\n+\tgithub.com/gruntwork-io/terratest v0.41.12\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.41.11 h1:EAHiK6PFWJCVkgW2yUompjSsZQzA0CfBcuqIaXtZdpk=\n-github.com/gruntwork-io/terratest v0.41.11/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.12 h1:j+7i+YvdyNatyNJcwn0pgxwYv1uWDH5S+znLssh3KXk=\n+github.com/gruntwork-io/terratest v0.41.12/go.mod h1:XHnt/nPqQ8v9LXzUZ3tj5QdM7JkRLaTBeiXP8lBelfk=\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit) | require | minor | `v0.4.1` -> `v0.5.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>GoogleCloudPlatform/cloud-foundation-toolkit</summary>\n\n### [`v0.5.0`](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/releases/tag/v0.5.0): CLI Release v0.5.0\n\n[Compare Source](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/compare/v0.4.1...v0.5.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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xNTkuMCIsInVwZGF0ZWRJblZlciI6IjM0LjE1OS4wIn0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -3,71 +3,74 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.18\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n \tgithub.com/gruntwork-io/terratest v0.41.11\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n \n require (\n-\tcloud.google.com/go v0.104.0 // indirect\n-\tcloud.google.com/go/compute v1.10.0 // indirect\n-\tcloud.google.com/go/iam v0.5.0 // indirect\n-\tcloud.google.com/go/storage v1.27.0 // indirect\n-\tgithub.com/PuerkitoBio/purell v1.1.1 // indirect\n-\tgithub.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect\n+\tcloud.google.com/go v0.110.0 // indirect\n+\tcloud.google.com/go/compute v1.18.0 // indirect\n+\tcloud.google.com/go/compute/metadata v0.2.3 // indirect\n+\tcloud.google.com/go/iam v0.12.0 // indirect\n+\tcloud.google.com/go/storage v1.29.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n \tgithub.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect\n-\tgithub.com/aws/aws-sdk-go v1.44.122 // indirect\n+\tgithub.com/aws/aws-sdk-go v1.44.209 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n \tgithub.com/davecgh/go-spew v1.1.1 // indirect\n-\tgithub.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect\n-\tgithub.com/go-openapi/jsonpointer v0.19.5 // indirect\n-\tgithub.com/go-openapi/jsonreference v0.19.3 // indirect\n-\tgithub.com/go-openapi/swag v0.19.5 // indirect\n+\tgithub.com/go-errors/errors v1.4.2 // indirect\n+\tgithub.com/go-openapi/jsonpointer v0.19.6 // indirect\n+\tgithub.com/go-openapi/jsonreference v0.20.2 // indirect\n+\tgithub.com/go-openapi/swag v0.22.3 // indirect\n \tgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect\n \tgithub.com/golang/protobuf v1.5.2 // indirect\n+\tgithub.com/google/gnostic v0.6.9 // indirect\n \tgithub.com/google/go-cmp v0.5.9 // indirect\n+\tgithub.com/google/gofuzz v1.2.0 // indirect\n \tgithub.com/google/uuid v1.3.0 // indirect\n-\tgithub.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect\n-\tgithub.com/googleapis/gax-go/v2 v2.6.0 // indirect\n-\tgithub.com/hashicorp/errwrap v1.0.0 // indirect\n+\tgithub.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect\n+\tgithub.com/googleapis/gax-go/v2 v2.7.0 // indirect\n+\tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n \tgithub.com/hashicorp/go-getter v1.7.0 // indirect\n-\tgithub.com/hashicorp/go-multierror v1.1.0 // indirect\n+\tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n-\tgithub.com/hashicorp/hcl/v2 v2.9.1 // indirect\n-\tgithub.com/hashicorp/terraform-json v0.13.0 // indirect\n-\tgithub.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect\n+\tgithub.com/hashicorp/hcl/v2 v2.16.1 // indirect\n+\tgithub.com/hashicorp/terraform-json v0.15.0 // indirect\n+\tgithub.com/jinzhu/copier v0.3.5 // indirect\n \tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n-\tgithub.com/klauspost/compress v1.15.11 // indirect\n-\tgithub.com/mailru/easyjson v0.7.0 // indirect\n-\tgithub.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect\n+\tgithub.com/josharian/intern v1.0.0 // indirect\n+\tgithub.com/klauspost/compress v1.15.15 // indirect\n+\tgithub.com/mailru/easyjson v0.7.7 // indirect\n+\tgithub.com/mattn/go-zglob v0.0.4 // indirect\n \tgithub.com/mitchellh/go-homedir v1.1.0 // indirect\n \tgithub.com/mitchellh/go-testing-interface v1.14.2-0.20210217184823-a52172cd2f64 // indirect\n \tgithub.com/mitchellh/go-wordwrap v1.0.1 // indirect\n \tgithub.com/pmezard/go-difflib v1.0.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n-\tgithub.com/tidwall/pretty v1.2.0 // indirect\n-\tgithub.com/tidwall/sjson v1.2.4 // indirect\n-\tgithub.com/tmccombs/hcl2json v0.3.3 // indirect\n-\tgithub.com/ulikunitz/xz v0.5.10 // indirect\n-\tgithub.com/zclconf/go-cty v1.9.1 // indirect\n-\tgo.opencensus.io v0.23.0 // indirect\n-\tgolang.org/x/crypto v0.1.0 // 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.4.0 // indirect\n+\tgithub.com/ulikunitz/xz v0.5.11 // indirect\n+\tgithub.com/zclconf/go-cty v1.13.0 // indirect\n+\tgo.opencensus.io v0.24.0 // indirect\n+\tgolang.org/x/crypto v0.6.0 // indirect\n+\tgolang.org/x/mod v0.8.0 // indirect\n \tgolang.org/x/net v0.7.0 // indirect\n-\tgolang.org/x/oauth2 v0.1.0 // indirect\n+\tgolang.org/x/oauth2 v0.5.0 // indirect\n \tgolang.org/x/sys v0.5.0 v1.6.7 indirect\n \tgolang.org/x/text v0.7.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n-\tgoogle.golang.org/api v0.100.0 // indirect\n+\tgoogle.golang.org/api v0.110.0 // indirect\n \tgoogle.golang.org/appengine v1.6.7 // indirect\n-\tgoogle.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71 // indirect\n-\tgoogle.golang.org/grpc v1.50.1 // indirect\n+\tgoogle.golang.org/genproto v0.0.0-20230223222841-637eb2293923 // indirect\n+\tgoogle.golang.org/grpc v1.53.0 // indirect\n \tgoogle.golang.org/protobuf v1.28.1 // indirect\n \tgopkg.in/yaml.v2 v2.4.0 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n-\tk8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect\n-\tsigs.k8s.io/kustomize/kyaml v0.13.6 // indirect\n+\tk8s.io/kube-openapi v0.0.0-20230224204730-66828de6f33b // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.14.0 // indirect\n )\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -3,71 +3,74 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.18\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n \tgithub.com/gruntwork-io/terratest v0.41.11\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n \n require (\n-\tcloud.google.com/go v0.104.0 // indirect\n-\tcloud.google.com/go/compute v1.10.0 // indirect\n-\tcloud.google.com/go/iam v0.5.0 // indirect\n-\tcloud.google.com/go/storage v1.27.0 // indirect\n-\tgithub.com/PuerkitoBio/purell v1.1.1 // indirect\n-\tgithub.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect\n+\tcloud.google.com/go v0.110.0 // indirect\n+\tcloud.google.com/go/compute v1.18.0 // indirect\n+\tcloud.google.com/go/compute/metadata v0.2.3 // indirect\n+\tcloud.google.com/go/iam v0.12.0 // indirect\n+\tcloud.google.com/go/storage v1.29.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n \tgithub.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect\n-\tgithub.com/aws/aws-sdk-go v1.44.122 // indirect\n+\tgithub.com/aws/aws-sdk-go v1.44.209 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n \tgithub.com/davecgh/go-spew v1.1.1 // indirect\n-\tgithub.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect\n-\tgithub.com/go-openapi/jsonpointer v0.19.5 // indirect\n-\tgithub.com/go-openapi/jsonreference v0.19.3 // indirect\n-\tgithub.com/go-openapi/swag v0.19.5 // indirect\n+\tgithub.com/go-errors/errors v1.4.2 // indirect\n+\tgithub.com/go-openapi/jsonpointer v0.19.6 // indirect\n+\tgithub.com/go-openapi/jsonreference v0.20.2 // indirect\n+\tgithub.com/go-openapi/swag v0.22.3 // indirect\n \tgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect\n \tgithub.com/golang/protobuf v1.5.2 // indirect\n+\tgithub.com/google/gnostic v0.6.9 // indirect\n \tgithub.com/google/go-cmp v0.5.9 // indirect\n+\tgithub.com/google/gofuzz v1.2.0 // indirect\n \tgithub.com/google/uuid v1.3.0 // indirect\n-\tgithub.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect\n-\tgithub.com/googleapis/gax-go/v2 v2.6.0 // indirect\n-\tgithub.com/hashicorp/errwrap v1.0.0 // indirect\n+\tgithub.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect\n+\tgithub.com/googleapis/gax-go/v2 v2.7.0 // indirect\n+\tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n \tgithub.com/hashicorp/go-getter v1.7.0 // indirect\n-\tgithub.com/hashicorp/go-multierror v1.1.0 // indirect\n+\tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n-\tgithub.com/hashicorp/hcl/v2 v2.9.1 // indirect\n-\tgithub.com/hashicorp/terraform-json v0.13.0 // indirect\n-\tgithub.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect\n+\tgithub.com/hashicorp/hcl/v2 v2.16.1 // indirect\n+\tgithub.com/hashicorp/terraform-json v0.15.0 // indirect\n+\tgithub.com/jinzhu/copier v0.3.5 // indirect\n \tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n-\tgithub.com/klauspost/compress v1.15.11 // indirect\n-\tgithub.com/mailru/easyjson v0.7.0 // indirect\n-\tgithub.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect\n+\tgithub.com/josharian/intern v1.0.0 // indirect\n+\tgithub.com/klauspost/compress v1.15.15 // indirect\n+\tgithub.com/mailru/easyjson v0.7.7 // indirect\n+\tgithub.com/mattn/go-zglob v0.0.4 // indirect\n \tgithub.com/mitchellh/go-homedir v1.1.0 v1.29.0 indirect\n \tgithub.com/mitchellh/go-testing-interface v1.14.2-0.20210217184823-a52172cd2f64 // indirect\n \tgithub.com/mitchellh/go-wordwrap v1.0.1 // indirect\n \tgithub.com/pmezard/go-difflib v1.0.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n-\tgithub.com/tidwall/pretty v1.2.0 // indirect\n-\tgithub.com/tidwall/sjson v1.2.4 // indirect\n-\tgithub.com/tmccombs/hcl2json v0.3.3 // indirect\n-\tgithub.com/ulikunitz/xz v0.5.10 // indirect\n-\tgithub.com/zclconf/go-cty v1.9.1 // indirect\n-\tgo.opencensus.io v0.23.0 // indirect\n-\tgolang.org/x/crypto v0.1.0 // 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.4.0 // indirect\n+\tgithub.com/ulikunitz/xz v0.5.11 // indirect\n+\tgithub.com/zclconf/go-cty v1.13.0 // indirect\n+\tgo.opencensus.io v0.24.0 // indirect\n+\tgolang.org/x/crypto v0.6.0 // indirect\n+\tgolang.org/x/mod v0.8.0 // indirect\n \tgolang.org/x/net v0.7.0 // indirect\n-\tgolang.org/x/oauth2 v0.1.0 // indirect\n+\tgolang.org/x/oauth2 v0.5.0 // indirect\n \tgolang.org/x/sys v0.5.0 // indirect\n \tgolang.org/x/text v0.7.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n-\tgoogle.golang.org/api v0.100.0 // indirect\n+\tgoogle.golang.org/api v0.110.0 // indirect\n \tgoogle.golang.org/appengine v1.6.7 // indirect\n-\tgoogle.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71 // indirect\n-\tgoogle.golang.org/grpc v1.50.1 // indirect\n+\tgoogle.golang.org/genproto v0.0.0-20230223222841-637eb2293923 // indirect\n+\tgoogle.golang.org/grpc v1.53.0 // indirect\n \tgoogle.golang.org/protobuf v1.28.1 // indirect\n \tgopkg.in/yaml.v2 v2.4.0 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n-\tk8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect\n-\tsigs.k8s.io/kustomize/kyaml v0.13.6 // indirect\n+\tk8s.io/kube-openapi v0.0.0-20230224204730-66828de6f33b // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.14.0 // indirect\n )\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -3,71 +3,74 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.18\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n \tgithub.com/gruntwork-io/terratest v0.41.11\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n \n require (\n-\tcloud.google.com/go v0.104.0 // indirect\n-\tcloud.google.com/go/compute v1.10.0 // indirect\n-\tcloud.google.com/go/iam v0.5.0 // indirect\n-\tcloud.google.com/go/storage v1.27.0 // indirect\n-\tgithub.com/PuerkitoBio/purell v1.1.1 // indirect\n-\tgithub.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect\n+\tcloud.google.com/go v0.110.0 // indirect\n+\tcloud.google.com/go/compute v1.18.0 // indirect\n+\tcloud.google.com/go/compute/metadata v0.2.3 // indirect\n+\tcloud.google.com/go/iam v0.12.0 // indirect\n+\tcloud.google.com/go/storage v1.29.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n \tgithub.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect\n-\tgithub.com/aws/aws-sdk-go v1.44.122 // indirect\n+\tgithub.com/aws/aws-sdk-go v1.44.209 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n \tgithub.com/davecgh/go-spew v1.1.1 // indirect\n-\tgithub.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect\n-\tgithub.com/go-openapi/jsonpointer v0.19.5 // indirect\n-\tgithub.com/go-openapi/jsonreference v0.19.3 // indirect\n-\tgithub.com/go-openapi/swag v0.19.5 // indirect\n+\tgithub.com/go-errors/errors v1.4.2 // indirect\n+\tgithub.com/go-openapi/jsonpointer v0.19.6 // indirect\n+\tgithub.com/go-openapi/jsonreference v0.20.2 // indirect\n+\tgithub.com/go-openapi/swag v0.22.3 // indirect\n \tgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect\n \tgithub.com/golang/protobuf v1.5.2 // indirect\n+\tgithub.com/google/gnostic v0.6.9 // indirect\n \tgithub.com/google/go-cmp v0.5.9 // indirect\n+\tgithub.com/google/gofuzz v1.2.0 // indirect\n \tgithub.com/google/uuid v1.3.0 // indirect\n-\tgithub.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect\n-\tgithub.com/googleapis/gax-go/v2 v2.6.0 // indirect\n-\tgithub.com/hashicorp/errwrap v1.0.0 // indirect\n+\tgithub.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect\n+\tgithub.com/googleapis/gax-go/v2 v2.7.0 // indirect\n+\tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n \tgithub.com/hashicorp/go-getter v1.7.0 // indirect\n-\tgithub.com/hashicorp/go-multierror v1.1.0 // indirect\n+\tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n-\tgithub.com/hashicorp/hcl/v2 v2.9.1 // indirect\n-\tgithub.com/hashicorp/terraform-json v0.13.0 // indirect\n-\tgithub.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect\n+\tgithub.com/hashicorp/hcl/v2 v2.16.1 // indirect\n+\tgithub.com/hashicorp/terraform-json v0.15.0 // indirect\n+\tgithub.com/jinzhu/copier v0.3.5 // indirect\n \tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n-\tgithub.com/klauspost/compress v1.15.11 // indirect\n-\tgithub.com/mailru/easyjson v0.7.0 // indirect\n-\tgithub.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect\n+\tgithub.com/josharian/intern v1.0.0 // indirect\n+\tgithub.com/klauspost/compress v1.15.15 // indirect\n+\tgithub.com/mailru/easyjson v0.7.7 // indirect\n+\tgithub.com/mattn/go-zglob v0.0.4 // indirect\n \tgithub.com/mitchellh/go-homedir v1.1.0 // indirect\n \tgithub.com/mitchellh/go-testing-interface v1.14.2-0.20210217184823-a52172cd2f64 // indirect\n \tgithub.com/mitchellh/go-wordwrap v1.0.1 // indirect\n \tgithub.com/pmezard/go-difflib v1.0.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n-\tgithub.com/tidwall/pretty v1.2.0 // indirect\n-\tgithub.com/tidwall/sjson v1.2.4 // indirect\n-\tgithub.com/tmccombs/hcl2json v0.3.3 // indirect\n-\tgithub.com/ulikunitz/xz v0.5.10 // indirect\n-\tgithub.com/zclconf/go-cty v1.9.1 // indirect\n-\tgo.opencensus.io v0.23.0 // indirect\n-\tgolang.org/x/crypto v0.1.0 // 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.4.0 // indirect\n+\tgithub.com/ulikunitz/xz v0.5.11 // indirect\n+\tgithub.com/zclconf/go-cty v1.13.0 // indirect\n+\tgo.opencensus.io v0.24.0 // indirect\n+\tgolang.org/x/crypto v0.6.0 // indirect\n+\tgolang.org/x/mod v0.8.0 // indirect\n \tgolang.org/x/net v0.7.0 // indirect\n-\tgolang.org/x/oauth2 v0.1.0 // indirect\n+\tgolang.org/x/oauth2 v0.5.0 // indirect\n \tgolang.org/x/sys v0.5.0 // indirect\n \tgolang.org/x/text v0.7.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n-\tgoogle.golang.org/api v0.100.0 // indirect\n+\tgoogle.golang.org/api v0.110.0 // indirect\n \tgoogle.golang.org/appengine v1.6.7 // indirect\n-\tgoogle.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71 // indirect\n-\tgoogle.golang.org/grpc v1.50.1 // indirect\n+\tgoogle.golang.org/genproto v0.0.0-20230223222841-637eb2293923 // indirect\n+\tgoogle.golang.org/grpc v1.53.0 // indirect\n \tgoogle.golang.org/protobuf v1.28.1 // indirect\n \tgopkg.in/yaml.v2 v2.4.0 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n-\tk8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect\n-\tsigs.k8s.io/kustomize/kyaml v0.13.6 // indirect\n+\tk8s.io/kube-openapi v0.0.0-20230224204730-66828de6f33b // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.14.0 // indirect\n )\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -3,71 +3,74 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.18\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.0\n \tgithub.com/gruntwork-io/terratest v0.41.11\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n \n require (\n-\tcloud.google.com/go v0.104.0 // indirect\n-\tcloud.google.com/go/compute v1.10.0 // indirect\n-\tcloud.google.com/go/iam v0.5.0 // indirect\n-\tcloud.google.com/go/storage v1.27.0 // indirect\n-\tgithub.com/PuerkitoBio/purell v1.1.1 // indirect\n-\tgithub.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect\n+\tcloud.google.com/go v0.110.0 // indirect\n+\tcloud.google.com/go/compute v1.18.0 // indirect\n+\tcloud.google.com/go/compute/metadata v0.2.3 // indirect\n+\tcloud.google.com/go/iam v0.12.0 // indirect\n+\tcloud.google.com/go/storage v1.29.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n \tgithub.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect\n-\tgithub.com/aws/aws-sdk-go v1.44.122 // indirect\n+\tgithub.com/aws/aws-sdk-go v1.44.209 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n \tgithub.com/davecgh/go-spew v1.1.1 indirect\n indirect\n-\tgithub.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect\n-\tgithub.com/go-openapi/jsonpointer v0.19.5 // indirect\n-\tgithub.com/go-openapi/jsonreference v0.19.3 // indirect\n-\tgithub.com/go-openapi/swag v0.19.5 // indirect\n+\tgithub.com/go-errors/errors v1.4.2 // indirect\n+\tgithub.com/go-openapi/jsonpointer v0.19.6 // indirect\n+\tgithub.com/go-openapi/jsonreference v0.20.2 // indirect\n+\tgithub.com/go-openapi/swag v0.22.3 // indirect\n \tgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect\n \tgithub.com/golang/protobuf v1.5.2 // indirect\n+\tgithub.com/google/gnostic v0.6.9 // indirect\n \tgithub.com/google/go-cmp v0.5.9 // indirect\n+\tgithub.com/google/gofuzz v1.2.0 // indirect\n \tgithub.com/google/uuid v1.3.0 // indirect\n-\tgithub.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect\n-\tgithub.com/googleapis/gax-go/v2 v2.6.0 // indirect\n-\tgithub.com/hashicorp/errwrap v1.0.0 // indirect\n+\tgithub.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect\n+\tgithub.com/googleapis/gax-go/v2 v2.7.0 // indirect\n+\tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n \tgithub.com/hashicorp/go-getter v1.7.0 // indirect\n-\tgithub.com/hashicorp/go-multierror v1.1.0 // indirect\n+\tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n-\tgithub.com/hashicorp/hcl/v2 v2.9.1 // indirect\n-\tgithub.com/hashicorp/terraform-json v0.13.0 // indirect\n-\tgithub.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect\n+\tgithub.com/hashicorp/hcl/v2 v2.16.1 // indirect\n+\tgithub.com/hashicorp/terraform-json v0.15.0 // indirect\n+\tgithub.com/jinzhu/copier v0.3.5 // indirect\n \tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n-\tgithub.com/klauspost/compress v1.15.11 // indirect\n-\tgithub.com/mailru/easyjson v0.7.0 // indirect\n-\tgithub.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect\n+\tgithub.com/josharian/intern v1.0.0 // indirect\n+\tgithub.com/klauspost/compress v1.15.15 // indirect\n+\tgithub.com/mailru/easyjson v0.7.7 // indirect\n+\tgithub.com/mattn/go-zglob v0.0.4 // indirect\n \tgithub.com/mitchellh/go-homedir v1.1.0 // indirect\n \tgithub.com/mitchellh/go-testing-interface v1.14.2-0.20210217184823-a52172cd2f64 // indirect\n \tgithub.com/mitchellh/go-wordwrap v1.0.1 // indirect\n \tgithub.com/pmezard/go-difflib v1.0.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n-\tgithub.com/tidwall/pretty v1.2.0 // indirect\n-\tgithub.com/tidwall/sjson v1.2.4 // indirect\n-\tgithub.com/tmccombs/hcl2json v0.3.3 // indirect\n-\tgithub.com/ulikunitz/xz v0.5.10 // indirect\n-\tgithub.com/zclconf/go-cty v1.9.1 // indirect\n-\tgo.opencensus.io v0.23.0 // indirect\n-\tgolang.org/x/crypto v0.1.0 // 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.4.0 // indirect\n+\tgithub.com/ulikunitz/xz v0.5.11 // indirect\n+\tgithub.com/zclconf/go-cty v1.13.0 // indirect\n+\tgo.opencensus.io v0.24.0 // indirect\n+\tgolang.org/x/crypto v0.6.0 // indirect\n+\tgolang.org/x/mod v0.8.0 // indirect\n \tgolang.org/x/net v0.7.0 // indirect\n-\tgolang.org/x/oauth2 v0.1.0 // indirect\n+\tgolang.org/x/oauth2 v0.5.0 // indirect\n \tgolang.org/x/sys v0.5.0 // indirect\n \tgolang.org/x/text v0.7.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n-\tgoogle.golang.org/api v0.100.0 // indirect\n+\tgoogle.golang.org/api v0.110.0 // indirect\n \tgoogle.golang.org/appengine v1.6.7 // indirect\n-\tgoogle.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71 // indirect\n-\tgoogle.golang.org/grpc v1.50.1 // indirect\n+\tgoogle.golang.org/genproto v0.0.0-20230223222841-637eb2293923 // indirect\n+\tgoogle.golang.org/grpc v1.53.0 // indirect\n \tgoogle.golang.org/protobuf v1.28.1 // indirect\n \tgopkg.in/yaml.v2 v2.4.0 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n-\tk8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect\n-\tsigs.k8s.io/kustomize/kyaml v0.13.6 // indirect\n+\tk8s.io/kube-openapi v0.0.0-20230224204730-66828de6f33b // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.14.0 // indirect\n )\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network 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.0.0-20210921155107-089bfa567519 to 0.1.0.\n<details>\n<summary>Commits</summary>\n<ul>\n<li>See full diff in <a href=\"https://github.com/golang/crypto/commits/v0.1.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 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)\n- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language\n- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language\n- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language\n- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language\n\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/terraform-google-modules/terraform-google-network/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -55,7 +55,7 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.10 // indirect\n \tgithub.com/zclconf/go-cty v1.9.1 // indirect\n \tgo.opencensus.io v0.23.0 // indirect\n-\tgolang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect\n+\tgolang.org/x/crypto v0.1.0 // indirect\n \tgolang.org/x/net v0.7.0 // indirect\n \tgolang.org/x/oauth2 v0.1.0 // // \tgolang.org/x/sys v0.5.0 // indirect\n---\ntest/integration/go.sum\n@@ -1031,8 +1031,9 @@ golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPh\n golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=\n golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=\n-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n+golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=\n+golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=\n golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -55,7 +55,7 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.10 // indirect\n \tgithub.com/zclconf/go-cty v1.9.1 // indirect\n \tgo.opencensus.io v0.23.0 // indirect\n-\tgolang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect\n+\tgolang.org/x/crypto v0.1.0 // indirect\n \tgolang.org/x/net v0.7.0 // indirect\n \tgolang.org/x/oauth2 v0.1.0 // indirect\n \tgolang.org/x/sys v0.5.0 // indirect\n---\ntest/integration/go.sum\n@@ -1031,8 +1031,9 @@ golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPh\n golang.org/x/crypto // h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=\n golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=\n-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n+golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=\n+golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=\n golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -55,7 +55,7 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.10 // indirect\n \tgithub.com/zclconf/go-cty v1.9.1 // indirect\n \tgo.opencensus.io v0.23.0 // indirect\n-\tgolang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect\n+\tgolang.org/x/crypto v0.1.0 // indirect\n \tgolang.org/x/net v0.7.0 // indirect\n \tgolang.org/x/oauth2 \tgithub.com/zclconf/go-cty // indirect\n \tgolang.org/x/sys v0.5.0 // indirect\n---\ntest/integration/go.sum\n@@ -1031,8 +1031,9 @@ golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPh\n golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=\n golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=\n-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n+golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=\n+golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=\n golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -55,7 +55,7 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.10 // indirect\n \tgithub.com/zclconf/go-cty v1.9.1 // indirect\n \tgo.opencensus.io v0.23.0 // indirect\n-\tgolang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect\n+\tgolang.org/x/crypto v0.1.0 // indirect\n \tgolang.org/x/net v0.7.0 // indirect\n \tgolang.org/x/oauth2 v0.1.0 // indirect\n \tgolang.org/x/sys v0.5.0 // indirect\n---\ntest/integration/go.sum\n@@ -1031,8 +1031,9 @@ golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPh\n golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=\n golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=\n-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n+golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=\n+golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=\n golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=\n golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [github.com/stretchr/testify](https://togithub.com/stretchr/testify) | require | patch | `v1.8.1` -> `v1.8.2` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>stretchr/testify</summary>\n\n### [`v1.8.2`](https://togithub.com/stretchr/testify/compare/v1.8.1...v1.8.2)\n\n[Compare Source](https://togithub.com/stretchr/testify/compare/v1.8.1...v1.8.2)\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xNTQuNyIsInVwZGF0ZWRJblZlciI6IjM0LjE1NC43In0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.18\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n \tgithub.com/gruntwork-io/terratest v0.41.11\n-\tgithub.com/stretchr/testify v1.8.1\n+\tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n \n---\ntest/integration/go.sum\n@@ -929,8 +929,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\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 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=\n-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=\n+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=\n github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=\n github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.18\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n \tgithub.com/gruntwork-io/terratest v0.41.11\n-\tgithub.com/stretchr/testify v1.8.1\n+\tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n \n---\ntest/integration/go.sum\n@@ -929,8 +929,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify -5,7 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 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=\n-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=\n+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=\n github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=\n github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.18\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n \tgithub.com/gruntwork-io/terratest v0.41.11\n-\tgithub.com/stretchr/testify v1.8.1\n+\tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=\n-github.com/stretchr/testify \n---\ntest/integration/go.sum\n@@ -929,8 +929,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\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 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=\n-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=\n+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=\n github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=\n github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -5,7 +5,7 @@ go 1.18\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n \tgithub.com/gruntwork-io/terratest v0.41.11\n-\tgithub.com/stretchr/testify v1.8.1\n+\tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n \n---\ntest/integration/go.sum\n@@ -929,8 +929,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify @@ h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\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 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=\n-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=\n+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=\n github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=\n github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nmodules/fabric-net-firewall/main.tf\n@@ +79,7 @@ resource \"google_compute_firewall\" \"allow-tag-ssh\" {\n protocol = \"tcp\"\n ports = [\"22\"]\n }\n+\n }\n \n resource \"google_compute_firewall\" \"allow-tag-http\" {\n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-firewall/main.tf\n@@ \"allow-tag-ssh\" +79,7 @@ resource \"google_compute_firewall\" \"allow-tag-ssh\" {\n protocol = \"tcp\"\n ports = [\"22\"]\n }\n+\n }\n \n resource \"google_compute_firewall\" \"allow-tag-http\" {\n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-firewall/main.tf\n@@ -79,6 +79,7 @@ resource \"google_compute_firewall\" \"allow-tag-ssh\" {\n protocol = \"tcp\"\n ports = [\"22\"]\n }\n+\n }\n \n resource \"google_compute_firewall\" \"allow-tag-http\" {\n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-firewall/main.tf\n@@ -79,6 +79,7 @@ resource \"google_compute_firewall\" \"allow-tag-ssh\" {\n = protocol = \"tcp\"\n ports = [\"22\"]\n }\n+\n }\n \n resource \"google_compute_firewall\" \"allow-tag-http\" {\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nmodules/fabric-net-firewall/main.tf\n@@ -79,6 +79,7 @@ resource \"google_compute_firewall\" \"allow-tag-ssh\" protocol = \"tcp\"\n ports = [\"22\"]\n }\n+\n }\n \n resource \"google_compute_firewall\" \"allow-tag-http\" {\n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-firewall/main.tf\n@@ -79,6 +79,7 @@ resource \"google_compute_firewall\" \"allow-tag-ssh\" {\n protocol = \"tcp\"\n ports = [\"22\"]\n }\n+\n \n resource \"google_compute_firewall\" \"allow-tag-http\" {\n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-firewall/main.tf\n@@ -79,6 +79,7 @@ resource \"google_compute_firewall\" \"allow-tag-ssh\" {\n protocol = \"tcp\"\n ports = [\"22\"]\n }\n+\n }\n \n resource \"google_compute_firewall\" \"allow-tag-http\" {\n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-firewall/main.tf\n@@ -79,6 +79,7 @@ resource \"google_compute_firewall\" \"allow-tag-ssh\" {\n protocol = \"tcp\"\n ports = [\"22\"]\n }\n+\n }\n \n resource \"google_compute_firewall\" {\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nRefers to: https://github.com/terraform-google-modules/terraform-google-network/issues/400\r\n\r\n**TL;DR**\r\nUnfortunately, adding subnets is handled via a list input but the output is generated from a map inside the subnets module. Which is lexicographically ordered. Therefore using the same index for the subnets input list and the subnets_self_links list doesn't necessarily reflect the same subnets.\r\n\r\n**COULD BE A BREAKING CHANGE FOR EXISTING PROJECTS USING THIS MODULE**\r\nIf someone references the subnets.self_links, the index order could potentially change. Depending on the order of the input subnets and their names.\n\n---\n\nChoice A:\nmodules/subnets-beta/main.tf\n@@ -14,52 +14,46 @@\n * limitations under the License.\n */\n \n-locals {\n- subnets = {\n- for x in var.subnets :\n- \"${x.subnet_region}/${x.subnet_name}\" => x\n- }\n-}\n-\n-\n /******************************************\n \tSubnet configuration\n *****************************************/\n resource \"google_compute_subnetwork\" \"subnetwork\" {\n provider = google-beta\n- for_each = local.subnets\n- name = each.value.subnet_name\n- ip_cidr_range = each.value.subnet_ip\n- region = each.value.subnet_region\n- private_ip_google_access = lookup(each.value, \"subnet_private_access\", \"false\")\n+ count = length(var.subnets)\n+ name = var.subnets[count.index].subnet_name\n+ ip_cidr_range = var.subnets[count.index].subnet_ip\n+ region = var.subnets[count.index].subnet_region\n+ private_ip_google_access = lookup(var.subnets[count.index], \"subnet_private_access\", \"false\")\n dynamic \"log_config\" {\n- for_each = lookup(each.value, \"subnet_flow_logs\", false) ? [{\n- aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n- flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n- metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ for_each = lookup(var.subnets[count.index], \"subnet_flow_logs\", false) ? [{\n+ aggregation_interval = lookup(var.subnets[count.index], \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n+ flow_sampling = lookup(var.subnets[count.index], \"subnet_flow_logs_sampling\", \"0.5\")\n+ metadata = lookup(var.subnets[count.index], \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(var.subnets[count.index], \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n flow_sampling = log_config.value.flow_sampling\n metadata = log_config.value.metadata\n+ filter_expr = log_config.value.filter_expr\n }\n }\n network = var.network_name\n project = var.project_id\n- description = lookup(each.value, \"description\", null)\n+ description = lookup(var.subnets[count.index], \"description\", null)\n secondary_ip_range = [\n for i in range(\n length(\n contains(\n- keys(var.secondary_ranges), each.value.subnet_name) == true\n- ? var.secondary_ranges[each.value.subnet_name]\n+ keys(var.secondary_ranges), var.subnets[count.index].subnet_name) == true\n+ ? var.secondary_ranges[var.subnets[count.index].subnet_name]\n : []\n )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n+ var.secondary_ranges[var.subnets[count.index].subnet_name][i]\n ]\n \n- purpose = lookup(each.value, \"purpose\", null)\n- role = lookup(each.value, \"role\", null)\n+ purpose = lookup(var.subnets[count.index], \"purpose\", null)\n+ role = lookup(var.subnets[count.index], \"role\", null)\n \n depends_on = [var.module_depends_on]\n }\n---\nmodules/subnets/main.tf\n@@ -14,29 +14,21 @@\n * limitations under the License.\n */\n \n-locals {\n- subnets = {\n- for x in var.subnets :\n- \"${x.subnet_region}/${x.subnet_name}\" => x\n- }\n-}\n-\n-\n /******************************************\n \tSubnet configuration\n *****************************************/\n resource \"google_compute_subnetwork\" \"subnetwork\" {\n- for_each = local.subnets\n- name = each.value.subnet_name\n- ip_cidr_range = each.value.subnet_ip\n- region = each.value.subnet_region\n- private_ip_google_access = lookup(each.value, \"subnet_private_access\", \"false\")\n+ count = length(var.subnets)\n+ name = var.subnets[count.index].subnet_name\n+ ip_cidr_range = var.subnets[count.index].subnet_ip\n+ region = var.subnets[count.index].subnet_region\n+ private_ip_google_access = lookup(var.subnets[count.index], \"subnet_private_access\", \"false\")\n dynamic \"log_config\" {\n- for_each = lookup(each.value, \"subnet_flow_logs\", false) ? [{\n- aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n- flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n- metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n- filter_expr = lookup(each.value, \"subnet_flow_logs_filter\", \"true\")\n+ for_each = lookup(var.subnets[count.index], \"subnet_flow_logs\", false) ? [{\n+ aggregation_interval = lookup(var.subnets[count.index], \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n+ flow_sampling = lookup(var.subnets[count.index], \"subnet_flow_logs_sampling\", \"0.5\")\n+ metadata = lookup(var.subnets[count.index], \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(var.subnets[count.index], \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n@@ -47,18 +39,18 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n }\n network = var.network_name\n project = var.project_id\n- description = lookup(each.value, \"description\", null)\n+ description = lookup(var.subnets[count.index], \"description\", null)\n secondary_ip_range = [\n for i in range(\n length(\n contains(\n- keys(var.secondary_ranges), each.value.subnet_name) == true\n- ? var.secondary_ranges[each.value.subnet_name]\n+ keys(var.secondary_ranges), var.subnets[count.index].subnet_name) == true\n+ ? var.secondary_ranges[var.subnets[count.index].subnet_name]\n : []\n )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n+ var.secondary_ranges[var.subnets[count.index].subnet_name][i]\n ]\n \n- purpose = lookup(each.value, \"purpose\", null)\n- role = lookup(each.value, \"role\", null)\n+ purpose = lookup(var.subnets[count.index], \"purpose\", null)\n+ role = lookup(var.subnets[count.index], \"role\", null)\n }\n---\n\n\n---\n\nChoice B:\nmodules/subnets-beta/main.tf\n@@ -14,52 +14,46 @@\n * limitations under the License.\n */\n \n-locals {\n- subnets = {\n- for x in var.subnets :\n- \"${x.subnet_region}/${x.subnet_name}\" => x\n- }\n-}\n-\n-\n /******************************************\n \tSubnet configuration\n *****************************************/\n resource \"google_compute_subnetwork\" \"subnetwork\" {\n provider = google-beta\n- for_each = local.subnets\n- name = each.value.subnet_name\n- ip_cidr_range = each.value.subnet_ip\n- region = each.value.subnet_region\n- private_ip_google_access = lookup(each.value, \"subnet_private_access\", \"false\")\n+ count = length(var.subnets)\n+ name = var.subnets[count.index].subnet_name\n+ ip_cidr_range = var.subnets[count.index].subnet_ip\n+ region = var.subnets[count.index].subnet_region\n+ private_ip_google_access = lookup(var.subnets[count.index], \"subnet_private_access\", \"false\")\n dynamic \"log_config\" {\n- for_each = lookup(each.value, \"subnet_flow_logs\", false) ? [{\n- aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n- flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n- metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ for_each = lookup(var.subnets[count.index], \"subnet_flow_logs\", false) ? [{\n+ aggregation_interval = lookup(var.subnets[count.index], \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n+ flow_sampling = lookup(var.subnets[count.index], \"subnet_flow_logs_sampling\", \"0.5\")\n+ metadata = lookup(var.subnets[count.index], \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(var.subnets[count.index], \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n flow_sampling = log_config.value.flow_sampling\n metadata = log_config.value.metadata\n+ filter_expr = log_config.value.filter_expr\n }\n }\n network = var.network_name\n project = var.project_id\n- description = lookup(each.value, \"description\", null)\n+ description = lookup(var.subnets[count.index], \"description\", null)\n secondary_ip_range = [\n for i in range(\n length(\n contains(\n- keys(var.secondary_ranges), each.value.subnet_name) == true\n- ? var.secondary_ranges[each.value.subnet_name]\n+ keys(var.secondary_ranges), var.subnets[count.index].subnet_name) == true\n+ ? var.secondary_ranges[var.subnets[count.index].subnet_name]\n : []\n )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n+ var.secondary_ranges[var.subnets[count.index].subnet_name][i]\n ]\n \n- purpose = lookup(each.value, \"purpose\", null)\n- role = lookup(each.value, \"role\", null)\n+ purpose = lookup(var.subnets[count.index], \"purpose\", null)\n+ role = lookup(var.subnets[count.index], \"role\", null)\n \n depends_on = [var.module_depends_on]\n }\n---\nmodules/subnets/main.tf\n@@ -14,29 +14,21 @@\n * limitations under the License.\n */\n \n-locals {\n- subnets = {\n- for x in var.subnets :\n- \"${x.subnet_region}/${x.subnet_name}\" => x\n- }\n-}\n-\n-\n /******************************************\n \tSubnet configuration\n *****************************************/\n resource \"google_compute_subnetwork\" \"subnetwork\" {\n- for_each = local.subnets\n- name = each.value.subnet_name\n- ip_cidr_range = each.value.subnet_ip\n- region = each.value.subnet_region\n- private_ip_google_access = lookup(each.value, \"subnet_private_access\", \"false\")\n+ count = length(var.subnets)\n+ name = var.subnets[count.index].subnet_name\n+ ip_cidr_range = var.subnets[count.index].subnet_ip\n+ region = var.subnets[count.index].subnet_region\n+ private_ip_google_access = lookup(var.subnets[count.index], \"subnet_private_access\", \"false\")\n dynamic \"log_config\" {\n- for_each = lookup(each.value, \"subnet_flow_logs\", false) ? [{\n- aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n- flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n- metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n- filter_expr = lookup(each.value, \"subnet_flow_logs_filter\", \"true\")\n+ for_each = lookup(var.subnets[count.index], \"subnet_flow_logs\", false) ? [{\n+ aggregation_interval = lookup(var.subnets[count.index], \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n+ flow_sampling = lookup(var.subnets[count.index], \"subnet_flow_logs_sampling\", \"0.5\")\n+ metadata = lookup(var.subnets[count.index], \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(var.subnets[count.index], \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n@@ -47,18 +39,18 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n }\n network = var.network_name\n project = var.project_id\n- description = lookup(each.value, \"description\", null)\n+ description = lookup(var.subnets[count.index], \"description\", null)\n secondary_ip_range = [\n for i in range(\n length(\n contains(\n- keys(var.secondary_ranges), each.value.subnet_name) == true\n- ? var.secondary_ranges[each.value.subnet_name]\n+ keys(var.secondary_ranges), var.subnets[count.index].subnet_name) == true\n+ ? var.secondary_ranges[var.subnets[count.index].subnet_name]\n : []\n )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n+ var.secondary_ranges[var.subnets[count.index].subnet_name][i]\n ]\n \n- purpose = lookup(each.value, \"purpose\", null)\n- role = lookup(each.value, \"role\", null)\n+ purpose = lookup(var.subnets[count.index], \"purpose\", null)\n+ role = lookup(var.subnets[count.index], \"role\", null)\n }\n---\n\n\n---\n\nChoice C:\nmodules/subnets-beta/main.tf\n@@ -14,52 +14,46 @@\n * limitations under the License.\n */\n \n-locals {\n- subnets = {\n- for x in var.subnets :\n- \"${x.subnet_region}/${x.subnet_name}\" => x\n- }\n-}\n-\n-\n /******************************************\n \tSubnet configuration\n *****************************************/\n resource \"google_compute_subnetwork\" \"subnetwork\" {\n provider = google-beta\n- for_each = local.subnets\n- name = each.value.subnet_name\n- ip_cidr_range = each.value.subnet_ip\n- region = each.value.subnet_region\n- private_ip_google_access = lookup(each.value, \"subnet_private_access\", \"false\")\n+ count = length(var.subnets)\n+ name = var.subnets[count.index].subnet_name\n+ ip_cidr_range = var.subnets[count.index].subnet_ip\n+ region = var.subnets[count.index].subnet_region\n+ private_ip_google_access = lookup(var.subnets[count.index], \"subnet_private_access\", \"false\")\n dynamic \"log_config\" {\n- for_each = lookup(each.value, \"subnet_flow_logs\", false) ? [{\n- aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n- flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n- metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ for_each = lookup(var.subnets[count.index], \"subnet_flow_logs\", false) ? [{\n+ aggregation_interval = lookup(var.subnets[count.index], \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n+ flow_sampling = lookup(var.subnets[count.index], \"subnet_flow_logs_sampling\", \"0.5\")\n+ metadata = lookup(var.subnets[count.index], \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(var.subnets[count.index], \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n flow_sampling = log_config.value.flow_sampling\n metadata = log_config.value.metadata\n+ filter_expr = log_config.value.filter_expr\n }\n }\n network = var.network_name\n project = var.project_id\n- description = lookup(each.value, \"description\", null)\n+ description = lookup(var.subnets[count.index], \"description\", null)\n secondary_ip_range = [\n for i in range(\n length(\n contains(\n- keys(var.secondary_ranges), each.value.subnet_name) == true\n- ? var.secondary_ranges[each.value.subnet_name]\n+ keys(var.secondary_ranges), var.subnets[count.index].subnet_name) == true\n+ ? var.secondary_ranges[var.subnets[count.index].subnet_name]\n : []\n )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n+ var.secondary_ranges[var.subnets[count.index].subnet_name][i]\n ]\n \n- purpose = lookup(each.value, \"purpose\", null)\n- role = lookup(each.value, \"role\", null)\n+ purpose = lookup(var.subnets[count.index], \"purpose\", null)\n+ role = lookup(var.subnets[count.index], \"role\", null)\n \n depends_on = [var.module_depends_on]\n }\n---\nmodules/subnets/main.tf\n@@ -14,29 +14,21 @@\n * limitations under the License.\n */\n \n-locals {\n- subnets = {\n- for x in var.subnets :\n- \"${x.subnet_region}/${x.subnet_name}\" => x\n- }\n-}\n-\n-\n /******************************************\n \tSubnet configuration\n *****************************************/\n resource \"google_compute_subnetwork\" \"subnetwork\" {\n- for_each = local.subnets\n- name = each.value.subnet_name\n- ip_cidr_range = each.value.subnet_ip\n- region = each.value.subnet_region\n- private_ip_google_access = lookup(each.value, \"subnet_private_access\", \"false\")\n+ count = length(var.subnets)\n+ name = var.subnets[count.index].subnet_name\n+ ip_cidr_range = var.subnets[count.index].subnet_ip\n+ region = var.subnets[count.index].subnet_region\n+ private_ip_google_access = lookup(var.subnets[count.index], \"subnet_private_access\", \"false\")\n dynamic \"log_config\" {\n- for_each = lookup(each.value, \"subnet_flow_logs\", false) ? aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n- flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n- metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n- filter_expr = lookup(each.value, \"subnet_flow_logs_filter\", \"true\")\n+ for_each = lookup(var.subnets[count.index], \"subnet_flow_logs\", false) ? [{\n+ aggregation_interval = lookup(var.subnets[count.index], \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n+ flow_sampling = lookup(var.subnets[count.index], \"subnet_flow_logs_sampling\", \"0.5\")\n+ metadata = lookup(var.subnets[count.index], \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(var.subnets[count.index], \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n@@ -47,18 +39,18 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n }\n network = var.network_name\n project = var.project_id\n- description = lookup(each.value, \"description\", null)\n+ description = lookup(var.subnets[count.index], \"description\", null)\n secondary_ip_range = [\n for i in range(\n length(\n contains(\n- keys(var.secondary_ranges), each.value.subnet_name) == true\n- ? var.secondary_ranges[each.value.subnet_name]\n+ keys(var.secondary_ranges), var.subnets[count.index].subnet_name) == true\n+ ? var.secondary_ranges[var.subnets[count.index].subnet_name]\n : []\n )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n+ var.secondary_ranges[var.subnets[count.index].subnet_name][i]\n ]\n \n- purpose = lookup(each.value, \"purpose\", null)\n- role = lookup(each.value, \"role\", null)\n+ purpose = lookup(var.subnets[count.index], \"purpose\", null)\n+ role = lookup(var.subnets[count.index], \"role\", null)\n }\n---\n\n\n---\n\nChoice D:\nmodules/subnets-beta/main.tf\n@@ -14,52 +14,46 @@\n * limitations under the License.\n */\n \n-locals {\n- subnets = {\n- for x in var.subnets :\n- \"${x.subnet_region}/${x.subnet_name}\" => x\n- }\n-}\n-\n-\n /******************************************\n \tSubnet configuration\n *****************************************/\n resource \"google_compute_subnetwork\" \"subnetwork\" {\n provider = google-beta\n- for_each = local.subnets\n- name = each.value.subnet_name\n- ip_cidr_range = each.value.subnet_ip\n- region = each.value.subnet_region\n- private_ip_google_access = lookup(each.value, \"subnet_private_access\", \"false\")\n+ count = length(var.subnets)\n+ name = var.subnets[count.index].subnet_name\n+ ip_cidr_range = var.subnets[count.index].subnet_ip\n+ region = var.subnets[count.index].subnet_region\n+ private_ip_google_access = lookup(var.subnets[count.index], \"subnet_private_access\", \"false\")\n dynamic \"log_config\" {\n- for_each = lookup(each.value, \"subnet_flow_logs\", false) ? [{\n- aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n- flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n- metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ for_each = lookup(var.subnets[count.index], \"subnet_flow_logs\", false) ? [{\n+ aggregation_interval = lookup(var.subnets[count.index], \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n+ flow_sampling = lookup(var.subnets[count.index], \"subnet_flow_logs_sampling\", \"0.5\")\n+ metadata = lookup(var.subnets[count.index], \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(var.subnets[count.index], \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n flow_sampling = log_config.value.flow_sampling\n metadata = log_config.value.metadata\n+ filter_expr = log_config.value.filter_expr\n }\n }\n network = var.network_name\n project = var.project_id\n- description = lookup(each.value, \"description\", null)\n+ description = lookup(var.subnets[count.index], \"description\", null)\n secondary_ip_range = [\n for i in range(\n length(\n contains(\n- keys(var.secondary_ranges), each.value.subnet_name) == true\n- ? var.secondary_ranges[each.value.subnet_name]\n+ keys(var.secondary_ranges), var.subnets[count.index].subnet_name) == true\n+ ? var.secondary_ranges[var.subnets[count.index].subnet_name]\n : []\n )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n+ var.secondary_ranges[var.subnets[count.index].subnet_name][i]\n ]\n \n- purpose = lookup(each.value, \"purpose\", null)\n- role = lookup(each.value, \"role\", null)\n+ purpose = lookup(var.subnets[count.index], \"purpose\", null)\n+ role = lookup(var.subnets[count.index], \"role\", null)\n \n depends_on = [var.module_depends_on]\n }\n---\nmodules/subnets/main.tf\n@@ -14,29 +14,21 @@\n * limitations under the License.\n */\n \n-locals {\n- subnets = {\n- for x in var.subnets :\n- \"${x.subnet_region}/${x.subnet_name}\" => x\n- }\n-}\n-\n-\n /******************************************\n \tSubnet configuration\n *****************************************/\n resource \"google_compute_subnetwork\" \"subnetwork\" {\n- for_each = local.subnets\n- name = each.value.subnet_name\n- ip_cidr_range = each.value.subnet_ip\n- region = each.value.subnet_region\n- private_ip_google_access = lookup(each.value, \"subnet_private_access\", \"false\")\n+ count = length(var.subnets)\n+ name = var.subnets[count.index].subnet_name\n+ ip_cidr_range = var.subnets[count.index].subnet_ip\n+ region = var.subnets[count.index].subnet_region\n+ private_ip_google_access = lookup(var.subnets[count.index], \"subnet_private_access\", \"false\")\n dynamic \"log_config\" {\n- for_each = lookup(each.value, \"subnet_flow_logs\", false) ? [{\n- aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n- flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n- metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n- filter_expr = lookup(each.value, \"subnet_flow_logs_filter\", \"true\")\n+ for_each = lookup(var.subnets[count.index], \"subnet_flow_logs\", false) ? [{\n+ aggregation_interval = lookup(var.subnets[count.index], \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n+ flow_sampling = lookup(var.subnets[count.index], \"subnet_flow_logs_sampling\", \"0.5\")\n+ metadata = lookup(var.subnets[count.index], \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(var.subnets[count.index], \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n@@ -47,18 +39,18 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n }\n network = var.network_name\n project = var.project_id\n- description = lookup(each.value, \"description\", null)\n+ description = lookup(var.subnets[count.index], \"description\", null)\n secondary_ip_range = [\n for i in range(\n length(\n contains(\n- keys(var.secondary_ranges), each.value.subnet_name) == true\n- ? var.secondary_ranges[each.value.subnet_name]\n+ keys(var.secondary_ranges), var.subnets[count.index].subnet_name) == true\n+ ? var.secondary_ranges[var.subnets[count.index].subnet_name]\n : []\n )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n+ var.secondary_ranges[var.subnets[count.index].subnet_name][i]\n ]\n \n- purpose = lookup(each.value, \"purpose\", null)\n- role = lookup(each.value, \"role\", null)\n+ purpose = lookup(var.subnets[count.index], \"purpose\", null)\n+ role = lookup(var.subnets[count.index], \"role\", null)\n }\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.9` -> `v0.41.11` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.11`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.11)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.10...v0.41.11)\n\n#### What's Changed\n\n- [#​1233](https://togithub.com/gruntwork-io/terratest/issues/1233) Failing tests fixes by [@​denis256](https://togithub.com/denis256) in [https://github.com/gruntwork-io/terratest/pull/1237](https://togithub.com/gruntwork-io/terratest/pull/1237)\n- Create a function to extract default az subnets by [@​hongil0316](https://togithub.com/hongil0316) in [https://github.com/gruntwork-io/terratest/pull/1248](https://togithub.com/gruntwork-io/terratest/pull/1248)\n\n**Full Changelog**: https://github.com/gruntwork-io/terratest/compare/v0.41.10...v0.41.11\n\n### [`v0.41.10`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.10)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.9...v0.41.10)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n#### Modules affected\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n- `k8s`\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n#### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Added functions to read pod logs\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n#### Special thanks\n\n<!-- Usernames of users that contributed to this release, if the contribution was external to Gruntwork. -->\n\nSpecial thanks to the following users for their contribution!\n\n- [@​jacobcrawford](https://togithub.com/jacobcrawford)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_CONTRIBUTORS_NEXT -->\n\n#### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1226](https://togithub.com/gruntwork-io/terratest/pull/1226)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xMjQuMiIsInVwZGF0ZWRJblZlciI6IjM0LjE0OC4wIn0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n-\tgithub.com/gruntwork-io/terratest v0.41.9\n+\tgithub.com/gruntwork-io/terratest v0.41.11\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -621,8 +621,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.9 h1:jyygu23iLcEFjGQhlvRx4R0EJVqOoriP+Ire4U9cZA0=\n-github.com/gruntwork-io/terratest v0.41.9/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.11 h1:EAHiK6PFWJCVkgW2yUompjSsZQzA0CfBcuqIaXtZdpk=\n+github.com/gruntwork-io/terratest v0.41.11/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ v1.1.0/go.mod +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n-\tgithub.com/gruntwork-io/terratest v0.41.9\n+\tgithub.com/gruntwork-io/terratest v0.41.11\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -621,8 +621,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.9 h1:jyygu23iLcEFjGQhlvRx4R0EJVqOoriP+Ire4U9cZA0=\n-github.com/gruntwork-io/terratest v0.41.9/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.11 h1:EAHiK6PFWJCVkgW2yUompjSsZQzA0CfBcuqIaXtZdpk=\n+github.com/gruntwork-io/terratest v0.41.11/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n-\tgithub.com/gruntwork-io/terratest v1.16.0/go.mod v0.41.11\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -621,8 +621,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.9 h1:jyygu23iLcEFjGQhlvRx4R0EJVqOoriP+Ire4U9cZA0=\n-github.com/gruntwork-io/terratest v0.41.9/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.11 h1:EAHiK6PFWJCVkgW2yUompjSsZQzA0CfBcuqIaXtZdpk=\n+github.com/gruntwork-io/terratest v0.41.11/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n-\tgithub.com/gruntwork-io/terratest v0.41.9\n+\tgithub.com/gruntwork-io/terratest v0.41.11\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -621,8 +621,8 @@ github.com/grpc-ecosystem/grpc-gateway @@ h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.9 h1:jyygu23iLcEFjGQhlvRx4R0EJVqOoriP+Ire4U9cZA0=\n-github.com/gruntwork-io/terratest v0.41.9/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.11 h1:EAHiK6PFWJCVkgW2yUompjSsZQzA0CfBcuqIaXtZdpk=\n+github.com/gruntwork-io/terratest v0.41.11/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network 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.1.0 to 0.7.0.\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/golang/net/commit/8e2b117aee74f6b86c207a808b0255de45c0a18a\"><code>8e2b117</code></a> http2/hpack: avoid quadratic complexity in hpack decoding</li>\n<li><a href=\"https://github.com/golang/net/commit/547e7edf3873d6f3a9c093d3785f9e2289e00746\"><code>547e7ed</code></a> http2: avoid referencing ResponseWrite.Write parameter after returning</li>\n<li><a href=\"https://github.com/golang/net/commit/39940adcaaa73e661124cb80fb8dd57ea929dbaf\"><code>39940ad</code></a> html: parse comments per HTML spec</li>\n<li><a href=\"https://github.com/golang/net/commit/87ce33ecb484cbb6bcfc8e506ce0330ef72e0847\"><code>87ce33e</code></a> go.mod: update golang.org/x dependencies</li>\n<li><a href=\"https://github.com/golang/net/commit/415cb6d518e71d202e2dc2f44c475cbff84eee72\"><code>415cb6d</code></a> all: fix some comments</li>\n<li><a href=\"https://github.com/golang/net/commit/7e3c19ca52e202ae203b1914fc00c8e47a4d72fa\"><code>7e3c19c</code></a> all: correct typos in comments</li>\n<li><a href=\"https://github.com/golang/net/commit/296f09aa3817abc1ddff7703799bf9babb7bbd16\"><code>296f09a</code></a> http2: case insensitive handling for 100-continue</li>\n<li><a href=\"https://github.com/golang/net/commit/f8411da775a685be247bbedcb3ed2c998f895cd2\"><code>f8411da</code></a> nettest: fix tests on dragonfly and js/wasm</li>\n<li><a href=\"https://github.com/golang/net/commit/8e0e7d8d38f2b6d21d742845570dde2902d06a1d\"><code>8e0e7d8</code></a> go.mod: update golang.org/x dependencies</li>\n<li><a href=\"https://github.com/golang/net/commit/7805fdc37dc2b54b28b9d621030e14dcf1dab67c\"><code>7805fdc</code></a> http2: rewrite inbound flow control tracking</li>\n<li>Additional commits viewable in <a href=\"https://github.com/golang/net/compare/v0.1.0...v0.7.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 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)\n- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language\n- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language\n- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language\n- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language\n\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/terraform-google-modules/terraform-google-network/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -56,10 +56,10 @@ require (\n \tgithub.com/zclconf/go-cty v1.9.1 // indirect\n \tgo.opencensus.io v0.23.0 // indirect\n \tgolang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect\n-\tgolang.org/x/net v0.1.0 // indirect\n+\tgolang.org/x/net v0.7.0 // indirect\n \tgolang.org/x/oauth2 v0.1.0 // indirect\n-\tgolang.org/x/sys v0.1.0 // indirect\n-\tgolang.org/x/text v0.4.0 // indirect\n+\tgolang.org/x/sys v0.5.0 // indirect\n+\tgolang.org/x/text v0.7.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n golang.org/x/text v0.100.0 // indirect\n \tgoogle.golang.org/appengine v1.6.7 // indirect\n---\ntest/integration/go.sum\n@@ -1134,8 +1134,9 @@ golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug\n golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=\n golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n-golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=\n golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=\n+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=\n+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=\n golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=\n golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n@@ -1283,13 +1284,14 @@ golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBc\n golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=\n golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=\n+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n+golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=\n golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n@@ -1299,8 +1301,9 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=\n-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=\n golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=\n+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -56,10 +56,10 @@ require (\n \tgithub.com/zclconf/go-cty v1.9.1 // indirect\n \tgo.opencensus.io v0.23.0 // indirect\n \tgolang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect\n-\tgolang.org/x/net v0.1.0 // indirect\n+\tgolang.org/x/net v0.7.0 // indirect\n \tgolang.org/x/oauth2 v0.1.0 // indirect\n-\tgolang.org/x/sys v0.1.0 // indirect\n-\tgolang.org/x/text v0.4.0 // indirect\n+\tgolang.org/x/sys v0.5.0 // indirect\n+\tgolang.org/x/text v0.7.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.100.0 // indirect\n \tgoogle.golang.org/appengine v1.6.7 // indirect\n---\ntest/integration/go.sum\n@@ -1134,8 +1134,9 @@ golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug\n golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=\n golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n-golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=\n golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=\n+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=\n+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=\n @@ v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=\n golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n@@ -1283,13 +1284,14 @@ golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBc\n golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=\n golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=\n+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n+golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=\n golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n@@ -1299,8 +1301,9 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=\n-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=\n golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=\n+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -56,10 +56,10 @@ require (\n \tgithub.com/zclconf/go-cty v1.9.1 // indirect\n \tgo.opencensus.io v0.23.0 // indirect\n \tgolang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect\n-\tgolang.org/x/net v0.1.0 // indirect\n+\tgolang.org/x/net v0.7.0 // indirect\n \tgolang.org/x/oauth2 v0.1.0 // indirect\n-\tgolang.org/x/sys v0.1.0 // indirect\n-\tgolang.org/x/text v0.4.0 // indirect\n+\tgolang.org/x/sys v0.5.0 // indirect\n+\tgolang.org/x/text v0.7.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.100.0 // indirect\n \tgoogle.golang.org/appengine v1.6.7 // indirect\n---\ntest/integration/go.sum\n@@ -1134,8 +1134,9 @@ golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug\n golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=\n golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n-golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=\n golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=\n+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=\n+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=\n golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=\n golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n@@ -1283,13 +1284,14 @@ golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBc\n golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=\n golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=\n+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n+golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=\n golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n@@ -1299,8 +1301,9 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=\n-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=\n golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=\n+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod // golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -56,10 +56,10 @@ require (\n \tgithub.com/zclconf/go-cty v1.9.1 // indirect\n \tgo.opencensus.io v0.23.0 // indirect\n \tgolang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect\n-\tgolang.org/x/net v0.1.0 // indirect\n+\tgolang.org/x/net v0.7.0 // indirect\n \tgolang.org/x/oauth2 v0.1.0 // indirect\n-\tgolang.org/x/sys v0.1.0 // indirect\n-\tgolang.org/x/text v0.4.0 // indirect\n+\tgolang.org/x/sys v0.5.0 // indirect\n+\tgolang.org/x/text v0.7.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.100.0 // indirect\n \tgoogle.golang.org/appengine v1.6.7 // indirect\n---\ntest/integration/go.sum\n@@ -1134,8 +1134,9 @@ golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug\n golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=\n golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n-golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=\n golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=\n+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=\n+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=\n golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=\n golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=\n@@ -1283,13 +1284,14 @@ golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBc\n golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=\n golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=\n+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n+golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=\n golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n@@ -1299,8 +1301,9 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=\n-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=\n golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=\n+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.8` -> `v0.41.9` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.9`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.9)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.8...v0.41.9)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n#### Modules affected\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n- `docker`\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n#### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Added a new attribute to docker-compose options named `ProjectName` which allows customizing the project name when docker-compose is executed.\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n#### Special thanks\n\n<!-- Usernames of users that contributed to this release, if the contribution was external to Gruntwork. -->\n\nSpecial thanks to the following users for their contribution!\n\n- [@​apenella](https://togithub.com/apenella)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_CONTRIBUTORS_NEXT -->\n\n#### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1187](https://togithub.com/gruntwork-io/terratest/pull/1187)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xMDguMSIsInVwZGF0ZWRJblZlciI6IjM0LjEwOC4xIn0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n-\tgithub.com/gruntwork-io/terratest v0.41.8\n+\tgithub.com/gruntwork-io/terratest v0.41.9\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -451,8 +451,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.8 h1:ZFVZIL2MnXLJ2g8s5lZ5pxI6ARiBAqse83oso1yPH58=\n-github.com/gruntwork-io/terratest h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.9 h1:jyygu23iLcEFjGQhlvRx4R0EJVqOoriP+Ire4U9cZA0=\n+github.com/gruntwork-io/terratest v0.41.9/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n-\tgithub.com/gruntwork-io/terratest v0.41.8\n+\tgithub.com/gruntwork-io/terratest v0.41.9\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -451,8 +451,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.8 h1:ZFVZIL2MnXLJ2g8s5lZ5pxI6ARiBAqse83oso1yPH58=\n-github.com/gruntwork-io/terratest v0.41.8/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.9 h1:jyygu23iLcEFjGQhlvRx4R0EJVqOoriP+Ire4U9cZA0=\n+github.com/gruntwork-io/terratest v0.41.9/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n-\tgithub.com/gruntwork-io/terratest v0.41.8\n+\tgithub.com/gruntwork-io/terratest v0.41.9\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -451,8 +451,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.8 h1:ZFVZIL2MnXLJ2g8s5lZ5pxI6ARiBAqse83oso1yPH58=\n-github.com/gruntwork-io/terratest v0.41.8/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.9 h1:jyygu23iLcEFjGQhlvRx4R0EJVqOoriP+Ire4U9cZA0=\n+github.com/gruntwork-io/terratest v0.41.9/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n-\tgithub.com/gruntwork-io/terratest v0.41.8\n+\tgithub.com/gruntwork-io/terratest v0.41.9\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -451,8 +451,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.8 h1:ZFVZIL2MnXLJ2g8s5lZ5pxI6ARiBAqse83oso1yPH58=\n-github.com/gruntwork-io/terratest v0.41.8/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.9 h1:jyygu23iLcEFjGQhlvRx4R0EJVqOoriP+Ire4U9cZA0=\n+github.com/gruntwork-io/terratest v0.41.9/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change | Pending |\n|---|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.7` -> `v0.41.8` | `v0.41.9` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.8`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.8)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.7...v0.41.8)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n#### Modules affected\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n- `k8s`\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n#### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Updated `PodNotAvailable` error to include pod status reason and message\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n#### Special thanks\n\n<!-- Usernames of users that contributed to this release, if the contribution was external to Gruntwork. -->\n\nSpecial thanks to the following users for their contribution!\n\n- [@​lahabana](https://togithub.com/lahabana)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_CONTRIBUTORS_NEXT -->\n\n#### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1223](https://togithub.com/gruntwork-io/terratest/pull/1223)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xMDUuNCIsInVwZGF0ZWRJblZlciI6IjM0LjEwNS40In0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n-\tgithub.com/gruntwork-io/terratest github.com/grpc-ecosystem/grpc-gateway v0.41.8\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -451,8 +451,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.7 h1:Vc0hb7ajWHutGA++gu/a9FSkuf+IuQuGDRymiWdrA04=\n-github.com/gruntwork-io/terratest v0.41.7/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.8 h1:ZFVZIL2MnXLJ2g8s5lZ5pxI6ARiBAqse83oso1yPH58=\n+github.com/gruntwork-io/terratest v0.41.8/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n-\tgithub.com/gruntwork-io/terratest v0.41.7\n+\tgithub.com/gruntwork-io/terratest v0.41.8\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -451,8 +451,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.7 h1:Vc0hb7ajWHutGA++gu/a9FSkuf+IuQuGDRymiWdrA04=\n-github.com/gruntwork-io/terratest v0.41.7/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.8 h1:ZFVZIL2MnXLJ2g8s5lZ5pxI6ARiBAqse83oso1yPH58=\n+github.com/gruntwork-io/terratest v0.41.8/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api @@ h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n-\tgithub.com/gruntwork-io/terratest v0.41.7\n+\tgithub.com/gruntwork-io/terratest v0.41.8\n \tgithub.com/stretchr/testify v1.8.1\n @@ v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -451,8 +451,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.7 h1:Vc0hb7ajWHutGA++gu/a9FSkuf+IuQuGDRymiWdrA04=\n-github.com/gruntwork-io/terratest v0.41.7/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.8 h1:ZFVZIL2MnXLJ2g8s5lZ5pxI6ARiBAqse83oso1yPH58=\n+github.com/gruntwork-io/terratest v0.41.8/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.1\n-\tgithub.com/gruntwork-io/terratest v0.41.7\n+\tgithub.com/gruntwork-io/terratest v0.41.8\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -451,8 +451,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.7 h1:Vc0hb7ajWHutGA++gu/a9FSkuf+IuQuGDRymiWdrA04=\n-github.com/gruntwork-io/terratest v0.41.7/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.8 h1:ZFVZIL2MnXLJ2g8s5lZ5pxI6ARiBAqse83oso1yPH58=\n+github.com/gruntwork-io/terratest v0.41.8/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNot sure if anyone might find this useful, but I ran into an issue where my state resource has the \"attributes\" key defined, but not \"attributes_flat\". Recently updated this project tf version to `0.12`, state version appears as `4`. I'm thinking that this might just be an artifact of having really old state. At any rate, this little modification allows the script to run on my archaic state and provide migration instructions without affecting original functionality.\n\n---\n\nChoice A:\nhelpers/migrate.py\n@@ -304,7 +304,12 @@ def resource_value(self, resource, key):\n else:\n state_resource = state_resource_list[0][\"instances\"]\n \n- return state_resource[0][\"attributes_flat\"][key]\n+ if \"attributes_flat\" in state_resource[0]:\n+ return state_resource[0][\"attributes_flat\"][key]\n+ elif \"attributes\" in state_resource[0]:\n+ return state_resource[0][\"attributes\"][key]\n+ else:\n+ raise \"Expected `attributes_flat` or `attributes` in resource!\"\n \n \n def group_by_module(resources):\n---\n\n\n---\n\nChoice B:\nhelpers/migrate.py\n@@ -304,7 +304,12 @@ def resource_value(self, resource, key):\n else:\n state_resource = state_resource_list[0][\"instances\"]\n \n- return state_resource[0][\"attributes_flat\"][key]\n+ if \"attributes_flat\" in state_resource[0]:\n+ return state_resource[0][\"attributes_flat\"][key]\n+ elif \"attributes\" in state_resource[0]:\n+ return state_resource[0][\"attributes\"][key]\n+ else:\n+ raise \"Expected `attributes_flat` or `attributes` in resource!\"\n \n \n def group_by_module(resources):\n---\n\n\n---\n\nChoice C:\nhelpers/migrate.py\n@@ -304,7 +304,12 @@ def resource_value(self, resource, key):\n else:\n state_resource = state_resource_list[0][\"instances\"]\n \n- return state_resource[0][\"attributes_flat\"][key]\n+ if \"attributes_flat\" in state_resource[0]:\n+ return state_resource[0][\"attributes_flat\"][key]\n+ elif \"attributes\" in state_resource[0]:\n+ return state_resource[0][\"attributes\"][key]\n+ else:\n+ raise \"Expected `attributes_flat` or `attributes` in resource!\"\n \n def group_by_module(resources):\n---\n\n\n---\n\nChoice D:\nhelpers/migrate.py\n@@ -304,7 +304,12 @@ def resource_value(self, resource, key):\n else:\n state_resource = state_resource_list[0][\"instances\"]\n \n- return state_resource[0][\"attributes_flat\"][key]\n+ if \"attributes_flat\" in state_resource[0]:\n+ return state_resource[0][\"attributes_flat\"][key]\n+ elif \"attributes\" in state_resource[0]:\n+ return state_resource[0][\"attributes\"][key]\n+ else:\n+ raise \"Expected `attributes_flat` or `attributes` in resource!\"\n \n \n def group_by_module(resources):\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nComplete the description of the properties:\r\nfirewall_rules\r\nsubnets\r\nroutes\r\nReported in this issue: https://github.com/terraform-google-modules/terraform-google-network/issues/379\n\n---\n\nChoice A:\n.gitignore\n@@ -46,3 +46,6 @@ crash.log\n test/fixtures/shared/terraform.tfvars\n \n credentials.json\n+\n+# IntelliJ workspace\n+/.idea/\n---\nmodules/subnets-beta/variables.tf\n@@ -23,7 +23,7 @@ variable \"network_name\" {\n }\n \n variable \"subnets\" {\n- type = list(map(string))\n+ type \n---\nvariables.tf\n@@ = list(map(any))\n description = \"The list of subnets being created\"\n }\n \n---\nmodules/subnets/variables.tf\n@@ -23,7 +23,7 @@ variable \"network_name\" {\n }\n \n variable \"subnets\" {\n- type = list(map(string))\n+ type = list(map(any))\n description = \"The list of subnets being created\"\n }\n \n---\nvariables.tf\n@@ -35,7 +35,7 @@ variable \"shared_vpc_host\" {\n }\n \n variable \"subnets\" {\n- type = list(map(string))\n+ type = list(map(any))\n description = \"The list of subnets being created\"\n }\n \n@@ -53,7 +53,7 @@ variable \"routes\" {\n \n variable \"firewall_rules\" {\n type = any\n- description = \"List of firewall rules\"\n+ description = \"List of maps that represent the firewall rules to be created. Each firewall rule is represented using a map that should contains this data: name, direction, priority, description, ranges, source_tags, source_service_accounts, target_tags, target_service_accounts, allow, deny, log_config\"\n default = []\n }\n \n---\n\n\n---\n\nChoice B:\n.gitignore\n@@ -46,3 +46,6 @@ crash.log\n test/fixtures/shared/terraform.tfvars\n \n credentials.json\n+\n+# IntelliJ workspace\n+/.idea/\n---\nmodules/subnets-beta/variables.tf\n@@ -23,7 +23,7 @@ variable \"network_name\" {\n }\n \n variable \"subnets\" {\n- type = list(map(string))\n+ type = list(map(any))\n description = \"The list of subnets being created\"\n }\n \n---\nmodules/subnets/variables.tf\n@@ -23,7 +23,7 @@ variable \"network_name\" {\n }\n \n variable \"subnets\" {\n- type = list(map(string))\n+ type = list(map(any))\n description = \"The list of subnets being created\"\n }\n \n---\nvariables.tf\n@@ -35,7 +35,7 @@ variable \"shared_vpc_host\" {\n }\n \n variable \"subnets\" {\n- type = list(map(string))\n+ type = list(map(any))\n description = \"The list of subnets being created\"\n }\n \n@@ -53,7 +53,7 @@ variable \"routes\" {\n \n variable \"firewall_rules\" {\n type = any\n- description = \"List of firewall rules\"\n+ description = \"List of maps that represent the firewall rules to be created. Each firewall rule is represented using a map that should contains this data: name, direction, priority, description, ranges, source_tags, source_service_accounts, target_tags, target_service_accounts, allow, deny, log_config\"\n default = []\n }\n \n---\n\n\n---\n\nChoice C:\n.gitignore\n@@ -46,3 +46,6 @@ crash.log\n test/fixtures/shared/terraform.tfvars\n \n credentials.json\n+\n+# IntelliJ workspace\n+/.idea/\n---\nmodules/subnets-beta/variables.tf\n@@ -23,7 +23,7 @@ variable \"network_name\" {\n }\n \n variable \"subnets\" {\n- type = = list(map(string))\n+ type = list(map(any))\n description = \"The list of subnets being created\"\n }\n \n---\nmodules/subnets/variables.tf\n@@ -23,7 +23,7 @@ variable \"network_name\" {\n }\n \n variable \"subnets\" {\n- type = list(map(string))\n+ type = list(map(any))\n description = \"The list of subnets being created\"\n }\n \n---\nvariables.tf\n@@ -35,7 +35,7 @@ variable \"shared_vpc_host\" {\n }\n \n variable \"subnets\" {\n- type = list(map(string))\n+ type = list(map(any))\n description = \"The list of subnets being created\"\n }\n \n@@ -53,7 +53,7 @@ variable \"routes\" {\n \n variable \"firewall_rules\" {\n type = any\n- description = \"List of firewall rules\"\n+ description = \"List of maps that represent the firewall rules to be created. Each firewall rule is represented using a map that should contains this data: name, direction, priority, description, ranges, source_tags, source_service_accounts, target_tags, target_service_accounts, allow, deny, log_config\"\n default = []\n }\n \n---\n\n\n---\n\nChoice D:\n.gitignore\n@@ -46,3 +46,6 @@ crash.log\n test/fixtures/shared/terraform.tfvars\n \n credentials.json\n+\n+# IntelliJ workspace\n+/.idea/\n---\nmodules/subnets-beta/variables.tf\n@@ -23,7 +23,7 @@ variable \"network_name\" {\n }\n \n variable \"subnets\" {\n- type = = list(map(string))\n+ type = list(map(any))\n description = \"The list of subnets being created\"\n }\n \n---\nmodules/subnets/variables.tf\n@@ -23,7 +23,7 @@ variable \"network_name\" {\n }\n \n variable \"subnets\" {\n- type = list(map(string))\n+ type = list(map(any))\n description = \"The list of subnets being created\"\n }\n \n---\nvariables.tf\n@@ -35,7 +35,7 @@ variable \"shared_vpc_host\" {\n }\n \n variable \"subnets\" {\n- type = list(map(string))\n+ type = list(map(any))\n description = \"The list of subnets being created\"\n }\n \n@@ -53,7 +53,7 @@ variable \"routes\" {\n \n variable \"firewall_rules\" {\n type = any\n- description = \"List of firewall rules\"\n+ description = \"List of maps that represent the firewall rules to be created. Each firewall rule is represented using a map that should contains this data: name, direction, priority, description, ranges, source_tags, source_service_accounts, target_tags, target_service_accounts, allow, deny, log_config\"\n default = []\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 VPC/network 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## [6.0.1](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.0...v6.0.1) (2022-12-30)\n\n\n### Bug Fixes\n\n* align subnet modules ([#412](https://github.com/terraform-google-modules/terraform-google-network/issues/412)) ([36d1c55](https://github.com/terraform-google-modules/terraform-google-network/commit/36d1c553ba757f8b3d73632e32b81395949de66c))\n* fixes lint issues and generates metadata ([#411](https://github.com/terraform-google-modules/terraform-google-network/issues/411)) ([f29b20c](https://github.com/terraform-google-modules/terraform-google-network/commit/f29b20c1242602d5e6b2a99ece7800661053aa26))\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@@ -2,6 +2,14 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [6.0.1](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.0...v6.0.1) (2022-12-30)\n+\n+\n+### Bug Fixes\n+\n+* align subnet modules ([#412](https://github.com/terraform-google-modules/terraform-google-network/issues/412)) ([36d1c55](https://github.com/terraform-google-modules/terraform-google-network/commit/36d1c553ba757f8b3d73632e32b81395949de66c))\n+* fixes lint issues and generates metadata ([#411](https://github.com/terraform-google-modules/terraform-google-network/issues/411)) ([f29b20c](https://github.com/terraform-google-modules/terraform-google-network/commit/f29b20c1242602d5e6b2a99ece7800661053aa26))\n+\n ## [6.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.2.0...v6.0.0) (2022-11-21)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v6.0.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v6.0.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v6.0.1\"\n }\n }\n---\nmodules/private-service-connect/versions.tf\n@@ -28,10 +28,10 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.1\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v6.0.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v6.0.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v6.0.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v6.0.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v6.0.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.1\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v6.0.1\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,14 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [6.0.1](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.0...v6.0.1) (2022-12-30)\n+\n+\n+### Bug Fixes\n+\n+* align subnet modules ([#412](https://github.com/terraform-google-modules/terraform-google-network/issues/412)) ([36d1c55](https://github.com/terraform-google-modules/terraform-google-network/commit/36d1c553ba757f8b3d73632e32b81395949de66c))\n+* fixes lint issues and generates metadata ([#411](https://github.com/terraform-google-modules/terraform-google-network/issues/411)) ([f29b20c](https://github.com/terraform-google-modules/terraform-google-network/commit/f29b20c1242602d5e6b2a99ece7800661053aa26))\n+\n ## [6.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.2.0...v6.0.0) (2022-11-21)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v6.0.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v6.0.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v6.0.1\"\n }\n }\n---\nmodules/private-service-connect/versions.tf\n@@ -28,10 +28,10 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.1\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v6.0.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v6.0.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v6.0.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v6.0.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v6.0.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.1\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v6.0.1\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,14 @@\n \n All notable changes \"google\" this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [6.0.1](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.0...v6.0.1) (2022-12-30)\n+\n+\n+### Bug Fixes\n+\n+* align subnet modules ([#412](https://github.com/terraform-google-modules/terraform-google-network/issues/412)) ([36d1c55](https://github.com/terraform-google-modules/terraform-google-network/commit/36d1c553ba757f8b3d73632e32b81395949de66c))\n+* fixes lint issues and generates metadata ([#411](https://github.com/terraform-google-modules/terraform-google-network/issues/411)) ([f29b20c](https://github.com/terraform-google-modules/terraform-google-network/commit/f29b20c1242602d5e6b2a99ece7800661053aa26))\n+\n ## [6.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.2.0...v6.0.0) (2022-11-21)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v6.0.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v6.0.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v6.0.1\"\n }\n }\n---\nmodules/private-service-connect/versions.tf\n@@ -28,10 +28,10 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.1\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v6.0.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v6.0.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v6.0.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v6.0.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v6.0.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.1\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v6.0.1\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,14 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [6.0.1](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.0...v6.0.1) (2022-12-30)\n+\n+\n+### Bug Fixes\n+\n+* align subnet modules ([#412](https://github.com/terraform-google-modules/terraform-google-network/issues/412)) ([36d1c55](https://github.com/terraform-google-modules/terraform-google-network/commit/36d1c553ba757f8b3d73632e32b81395949de66c))\n+* fixes lint issues and generates metadata ([#411](https://github.com/terraform-google-modules/terraform-google-network/issues/411)) ([f29b20c](https://github.com/terraform-google-modules/terraform-google-network/commit/f29b20c1242602d5e6b2a99ece7800661053aa26))\n+\n ## [6.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.2.0...v6.0.0) (2022-11-21)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v6.0.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v6.0.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -37,6 +37,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v6.0.1\"\n }\n }\n---\nmodules/private-service-connect/versions.tf\n@@ -28,10 +28,10 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.1\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v6.0.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v6.0.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v6.0.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v6.0.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v6.0.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.1\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v6.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v6.0.1\"\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nBeen noticing this issue: https://github.com/hashicorp/terraform-provider-google/issues/11304\r\nWhen using this beta module; it is possible to add that line to prevent it?\n\n---\n\nChoice A:\nmodules/vpc-serverless-connector-beta/main.tf\n@@ -35,4 +35,11 @@ resource \"google_vpc_access_connector\" \"connector_beta\" {\n min_instances = lookup(each.value, \"min_instances\", null)\n max_instances null)\n lookup(each.value, \"max_instances\", null)\n max_throughput = lookup(each.value, \"max_throughput\", null)\n+\n+ # REF: https://github.com/hashicorp/terraform-provider-google/issues/11304\n+ lifecycle {\n+ ignore_changes = [\n+ network\n+ ]\n+ }\n }\n---\n\n\n---\n\nChoice B:\nmodules/vpc-serverless-connector-beta/main.tf\n@@ -35,4 +35,11 @@ resource \"google_vpc_access_connector\" \"connector_beta\" {\n min_instances = lookup(each.value, \"min_instances\", null)\n max_instances = lookup(each.value, \"max_instances\", null)\n max_throughput = lookup(each.value, \"max_throughput\", null)\n+\n+ # REF: https://github.com/hashicorp/terraform-provider-google/issues/11304\n+ lifecycle {\n+ ignore_changes = [\n+ network\n+ ]\n+ }\n }\n---\n\n\n---\n\nChoice C:\nmodules/vpc-serverless-connector-beta/main.tf\n@@ -35,4 +35,11 @@ resource \"google_vpc_access_connector\" \"connector_beta\" {\n min_instances = lookup(each.value, \"min_instances\", null)\n max_instances = lookup(each.value, \"max_instances\", null)\n max_throughput max_instances lookup(each.value, \"max_throughput\", null)\n+\n+ # REF: https://github.com/hashicorp/terraform-provider-google/issues/11304\n+ lifecycle {\n+ ignore_changes = [\n+ network\n+ ]\n+ }\n }\n---\n\n\n---\n\nChoice D:\nmodules/vpc-serverless-connector-beta/main.tf\n@@ +35,11 @@ resource \"google_vpc_access_connector\" \"connector_beta\" {\n min_instances = lookup(each.value, \"min_instances\", null)\n max_instances = lookup(each.value, \"max_instances\", null)\n max_throughput = lookup(each.value, \"max_throughput\", null)\n+\n+ # REF: https://github.com/hashicorp/terraform-provider-google/issues/11304\n+ lifecycle {\n+ ignore_changes = [\n+ network\n+ ]\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nAs mentioned in #407 I just aligned the two module definition and READMEs, as there are virtually the same as of now and will only be be kept for potential future beta features and backwards compatibility as requested by you @bharathkkb.\n\n---\n\nChoice A:\nmodules/subnets-beta/README.md\n@@ -6,11 +6,6 @@ It supports creating:\n \n - Subnets within vpc network.\n \n-It also uses google beta provider to support the following resource fields:\n-\n-- google_compute_subnetwork.purpose\n-- google_compute_subnetwork.role\n-\n ## Usage\n \n Basic usage of this submodule is as follows:\n@@ -47,6 +42,7 @@ module \"vpc\" {\n subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n subnet_flow_logs_sampling = 0.7\n subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_flow_logs_filter_expr = \"true\"\n }\n ]\n \n@@ -86,10 +82,16 @@ module \"vpc\" {\n \n The subnets list contains maps, where each object represents a subnet. Each map has the following inputs (please see examples folder for additional references):\n \n-| Name | Description | Type | Default | Required |\n-|------|-------------|:----:|:-----:|:-----:|\n-| subnet\\_name | The name of the subnet being created | string | - | yes |\n-| subnet\\_ip | The IP and CIDR range of the subnet being created | string | - | yes |\n-| subnet\\_region | The region where the subnet will be created | string | - | yes |\n-| subnet\\_private\\_access | Whether this subnet will have private Google access enabled | string | `\"false\"` | no |\n-| subnet\\_flow\\_logs | Whether the subnet will record and send flow log data to logging | string | `\"false\"` | no |\n+| Name | Description | Type | Default | Required |\n+| ---------------------------- | --------------------------------------------------------------------------------------------------------------- | :----: | :----------------------: | :------: |\n+| subnet\\_name | The name of the subnet being created | string | - | yes |\n+| subnet\\_ip | The IP and CIDR range of the subnet being created | string | - | yes |\n+| subnet\\_region | The region where the subnet will be created | string | - | yes |\n+| subnet\\_private\\_access | Whether this subnet will have private Google access enabled | string | `\"false\"` | no |\n+| subnet\\_flow\\_logs | Whether the subnet will record and send flow log data to logging | string | `\"false\"` | no |\n+| subnet\\_flow\\_logs\\_interval | If subnet\\_flow\\_logs is true, sets the aggregation interval for collecting flow logs | string | `\"INTERVAL_5_SEC\"` | no |\n+| subnet\\_flow\\_logs\\_sampling | If subnet\\_flow\\_logs is true, set the sampling rate of VPC flow logs within the subnetwork | string | `\"0.5\"` | no |\n+| subnet\\_flow\\_logs\\_metadata | If subnet\\_flow\\_logs is true, configures whether metadata fields should be added to the reported VPC flow logs | string | `\"INCLUDE_ALL_METADATA\"` | no |\n+| subnet\\_flow\\_logs\\_filter_expr | Export filter defining which VPC flow logs should be logged, see https://cloud.google.com/vpc/docs/flow-logs#filtering for formatting details | string | `\"true\"` | no |\n+| purpose | The purpose of the subnet usage. Whether it is to be used as a regular subnet or for proxy or loadbalacing purposes, see https://cloud.google.com/vpc/docs/subnets#purpose for more details | string | `\"PRIVATE\"` | no |\n+| role | The role of the subnet when using it as a proxy or loadbalancer network. Whether it is to be used as the active or as a backup subnet, see https://cloud.google.com/load-balancing/docs/proxy-only-subnets#proxy_only_subnet_create for more details | string | - | no |\n---\nmodules/subnets-beta/main.tf\n@@ -37,11 +37,13 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(each.value, \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n flow_sampling = log_config.value.flow_sampling\n metadata = log_config.value.metadata\n+ filter_expr = log_config.value.filter_expr\n }\n }\n network = var.network_name\n---\nmodules/subnets/README.md\n@@ -31,6 +31,8 @@ module \"vpc\" {\n subnet_private_access = \"true\"\n subnet_flow_logs = \"true\"\n description = \"This subnet has a description\"\n+ purpose = \"INTERNAL_HTTPS_LOAD_BALANCER\"\n+ role = \"ACTIVE\"\n },\n {\n subnet_name = \"subnet-03\"\n@@ -90,3 +92,5 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_sampling | If subnet\\_flow\\_logs is true, set the sampling rate of VPC flow logs within the subnetwork | string | `\"0.5\"` | no |\n | subnet\\_flow\\_logs\\_metadata | If subnet\\_flow\\_logs is true, configures whether metadata fields should be added to the reported VPC flow logs | string | `\"INCLUDE_ALL_METADATA\"` | no |\n | subnet\\_flow\\_logs\\_filter_expr | Export filter defining which VPC flow logs should be logged, see https://cloud.google.com/vpc/docs/flow-logs#filtering for formatting details | string | `\"true\"` | no |\n+| purpose | The purpose of the subnet usage. Whether it is to be used as a regular subnet or for proxy or loadbalacing purposes, see https://cloud.google.com/vpc/docs/subnets#purpose for more details | string | `\"PRIVATE\"` | no |\n+| role | The role of the subnet when using it as a proxy or loadbalancer network. Whether it is to be used as the active or as a backup subnet, see https://cloud.google.com/load-balancing/docs/proxy-only-subnets#proxy_only_subnet_create for more details | string | - | no |\n---\n\n\n---\n\nChoice B:\nmodules/subnets-beta/README.md\n@@ -6,11 +6,6 @@ It supports creating:\n \n - Subnets within vpc network.\n \n-It also uses google beta provider to support the following resource fields:\n-\n-- google_compute_subnetwork.purpose\n-- google_compute_subnetwork.role\n-\n ## Usage\n \n Basic usage of this submodule is as follows:\n@@ -47,6 +42,7 @@ module \"vpc\" {\n subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n subnet_flow_logs_sampling = 0.7\n subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_flow_logs_filter_expr = \"true\"\n }\n ]\n \n@@ -86,10 +82,16 @@ module \"vpc\" {\n \n The subnets list contains maps, where each object represents a subnet. Each map has the following inputs (please see examples folder for additional references):\n \n-| Name | Description | Type | Default | Required |\n-|------|-------------|:----:|:-----:|:-----:|\n-| subnet\\_name | The name of the subnet being created | string | - | yes |\n-| subnet\\_ip | The IP and CIDR range of the subnet being created | string | - | yes |\n-| subnet\\_region | The region where the subnet will be created | string | - | yes |\n-| subnet\\_private\\_access | Whether this subnet will have private Google access enabled | string | `\"false\"` | no |\n-| subnet\\_flow\\_logs | Whether the subnet will record and send flow log data to logging | string | `\"false\"` | no |\n+| Name | Description | Type | Default | Required |\n+| ---------------------------- | --------------------------------------------------------------------------------------------------------------- | :----: | :----------------------: | :------: |\n+| subnet\\_name | The name of the subnet being created | string | - | yes |\n+| subnet\\_ip | The IP and CIDR range of the subnet being created | string | - | yes |\n+| subnet\\_region | The region where the subnet will be created | string | - | yes |\n+| subnet\\_private\\_access | Whether this subnet will have private Google access enabled | string | `\"false\"` | no |\n+| subnet\\_flow\\_logs | Whether the subnet will record and send flow log data to logging | string | `\"false\"` | no |\n+| subnet\\_flow\\_logs\\_interval | If subnet\\_flow\\_logs is true, sets the aggregation interval for collecting flow logs | string | `\"INTERVAL_5_SEC\"` | no |\n+| subnet\\_flow\\_logs\\_sampling | If subnet\\_flow\\_logs is true, set the sampling rate of VPC flow logs within the subnetwork | string | `\"0.5\"` | no |\n+| subnet\\_flow\\_logs\\_metadata | If subnet\\_flow\\_logs is true, configures whether metadata fields should be added to the reported VPC flow logs | string | `\"INCLUDE_ALL_METADATA\"` | no |\n+| subnet\\_flow\\_logs\\_filter_expr | Export filter defining which VPC flow logs should be logged, see https://cloud.google.com/vpc/docs/flow-logs#filtering for formatting details | string | `\"true\"` | no |\n+| purpose | The purpose of the subnet usage. Whether it is to be used as a regular subnet or for proxy or loadbalacing purposes, see https://cloud.google.com/vpc/docs/subnets#purpose for more details | string | `\"PRIVATE\"` | no |\n+| role | The role of the subnet when using it as a proxy or loadbalancer network. Whether it is to be used as the active or as a backup subnet, see https://cloud.google.com/load-balancing/docs/proxy-only-subnets#proxy_only_subnet_create for more details | string | - | no |\n---\nmodules/subnets-beta/main.tf\n@@ -37,11 +37,13 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(each.value, \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n flow_sampling = log_config.value.flow_sampling\n metadata = log_config.value.metadata\n+ filter_expr = log_config.value.filter_expr\n }\n }\n network = var.network_name\n---\nmodules/subnets/README.md\n@@ -31,6 +31,8 @@ module \"vpc\" {\n subnet_private_access = \"true\"\n subnet_flow_logs = \"true\"\n description = \"This subnet has a description\"\n+ purpose = \"INTERNAL_HTTPS_LOAD_BALANCER\"\n+ role = \"ACTIVE\"\n },\n {\n subnet_name = \"subnet-03\"\n@@ -90,3 +92,5 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_sampling | If subnet\\_flow\\_logs is true, set the sampling rate of VPC flow logs within the subnetwork | string | `\"0.5\"` | no |\n | subnet\\_flow\\_logs\\_metadata | If subnet\\_flow\\_logs is true, configures whether metadata fields should be added to the reported VPC flow logs | string | `\"INCLUDE_ALL_METADATA\"` | no |\n | subnet\\_flow\\_logs\\_filter_expr | Export filter defining which VPC flow logs should be logged, see https://cloud.google.com/vpc/docs/flow-logs#filtering for formatting details | string | `\"true\"` | no |\n+| purpose | The purpose of the subnet usage. Whether it is to be used as a regular subnet or for proxy or loadbalacing purposes, see https://cloud.google.com/vpc/docs/subnets#purpose for more details | string | `\"PRIVATE\"` | no |\n+| role | The role of the subnet when using it as a proxy or loadbalancer network. Whether it is to be used as the active or as a backup subnet, see https://cloud.google.com/load-balancing/docs/proxy-only-subnets#proxy_only_subnet_create for more details | string | - | no |\n---\n\n\n---\n\nChoice C:\nmodules/subnets-beta/README.md\n@@ -6,11 +6,6 @@ It supports creating:\n \n - Subnets within vpc network.\n \n-It also uses google beta provider to support the following resource fields:\n-\n-- google_compute_subnetwork.purpose\n-- google_compute_subnetwork.role\n-\n ## Usage\n \n Basic usage of this submodule is as follows:\n@@ -47,6 +42,7 @@ module \"vpc\" {\n subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n subnet_flow_logs_sampling = 0.7\n subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_flow_logs_filter_expr = \"true\"\n }\n ]\n \n@@ -86,10 +82,16 @@ module \"vpc\" {\n \n The subnets list contains maps, where each object represents a subnet. Each map has the following inputs (please see examples folder for additional references):\n \n-| Name | Description | Type | Default | Required |\n-|------|-------------|:----:|:-----:|:-----:|\n-| subnet\\_name | The name of the subnet being created | string | - | yes |\n-| subnet\\_ip | The IP and CIDR range of the subnet being created | string | - | yes |\n-| subnet\\_region | The region where the subnet will be created | string | - | yes |\n-| subnet\\_private\\_access | Whether this subnet will have private Google access enabled | string | `\"false\"` | no |\n-| subnet\\_flow\\_logs | Whether the subnet will record and send flow log data to logging | string | `\"false\"` | no |\n+| Name | Description | Type | Default | Required |\n+| ---------------------------- | --------------------------------------------------------------------------------------------------------------- | :----: | :----------------------: | :------: |\n+| subnet\\_name | The name of the subnet being created | string | - | yes |\n+| subnet\\_ip | The IP and CIDR range of the subnet being created | string | - | yes |\n+| subnet\\_region | The region where the subnet will be created | string | - | yes |\n+| subnet\\_private\\_access | Whether this subnet will have private Google access enabled | string | `\"false\"` | no |\n+| subnet\\_flow\\_logs | Whether the subnet will record and send flow log data to logging | string | `\"false\"` | no |\n+| subnet\\_flow\\_logs\\_interval | If subnet\\_flow\\_logs is true, sets the aggregation interval for collecting flow logs | string | `\"INTERVAL_5_SEC\"` | no |\n+| subnet\\_flow\\_logs\\_sampling | If subnet\\_flow\\_logs is true, set the sampling rate of VPC flow logs within the subnetwork | string | `\"0.5\"` | no |\n+| subnet\\_flow\\_logs\\_metadata | If subnet\\_flow\\_logs is true, configures whether metadata fields should be added to the reported VPC flow logs | string | `\"INCLUDE_ALL_METADATA\"` | no |\n+| subnet\\_flow\\_logs\\_filter_expr | Export filter defining which VPC flow logs should be logged, see https://cloud.google.com/vpc/docs/flow-logs#filtering for formatting details | string | `\"true\"` | no |\n+| purpose | The purpose of the subnet usage. Whether it is to be used as a regular subnet or for proxy or loadbalacing purposes, see https://cloud.google.com/vpc/docs/subnets#purpose for more details | string | `\"PRIVATE\"` | no |\n+| role | The role of the subnet when using it as a proxy or loadbalancer network. Whether it is to be used as the active or as a backup subnet, see https://cloud.google.com/load-balancing/docs/proxy-only-subnets#proxy_only_subnet_create for more details | string | - | no |\n---\nmodules/subnets-beta/main.tf\n@@ -37,11 +37,13 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(each.value, \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n flow_sampling = log_config.value.flow_sampling\n metadata = log_config.value.metadata\n+ filter_expr = log_config.value.filter_expr\n }\n }\n network = var.network_name\n---\nmodules/subnets/README.md\n@@ -31,6 +31,8 @@ module \"vpc\" {\n subnet_private_access = \"true\"\n subnet_flow_logs = \"true\"\n description = \"This subnet has a description\"\n+ purpose = \"INTERNAL_HTTPS_LOAD_BALANCER\"\n+ role = \"ACTIVE\"\n },\n {\n subnet_name = \"subnet-03\"\n@@ -90,3 +92,5 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_sampling | If subnet\\_flow\\_logs is true, set the sampling rate of VPC flow logs within the subnetwork | string | `\"0.5\"` | no |\n | subnet\\_flow\\_logs\\_metadata | If subnet\\_flow\\_logs is true, configures whether metadata fields should be added to the reported VPC flow logs | string | `\"INCLUDE_ALL_METADATA\"` | no |\n | subnet\\_flow\\_logs\\_filter_expr | Export filter defining which VPC flow logs should be logged, see https://cloud.google.com/vpc/docs/flow-logs#filtering for formatting details | string | `\"true\"` | no |\n+| purpose | The purpose of the subnet usage. Whether it is to be used as a regular subnet or for proxy or loadbalacing purposes, see https://cloud.google.com/vpc/docs/subnets#purpose for more details | string | `\"PRIVATE\"` | no |\n+| role | The role of the subnet when using it as a proxy or loadbalancer network. Whether it is to be used as the active or as a backup subnet, see https://cloud.google.com/load-balancing/docs/proxy-only-subnets#proxy_only_subnet_create for more details | string | - | no |\n---\n\n\n---\n\nChoice D:\nmodules/subnets-beta/README.md\n@@ -6,11 +6,6 @@ It supports creating:\n \n - Subnets within vpc network.\n \n-It also uses google beta provider to support the following resource fields:\n-\n-- google_compute_subnetwork.purpose\n-- google_compute_subnetwork.role\n-\n ## Usage\n \n Basic usage of this submodule is as follows:\n@@ -47,6 +42,7 @@ module \"vpc\" {\n subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n subnet_flow_logs_sampling = 0.7\n subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_flow_logs_filter_expr = \"true\"\n }\n ]\n \n@@ -86,10 +82,16 @@ module \"vpc\" {\n \n The subnets list contains maps, where each object represents a subnet. Each map has the following inputs (please see examples folder for additional references):\n \n-| Name | Description | Type | Default | Required |\n-|------|-------------|:----:|:-----:|:-----:|\n-| subnet\\_name | The name of the subnet being created | string | - | yes |\n-| subnet\\_ip | The IP and CIDR range of the subnet being created | string | - | yes |\n-| subnet\\_region | The region where the subnet will be created | string | - | yes |\n-| subnet\\_private\\_access | Whether this subnet will have private Google access enabled | string | `\"false\"` | no |\n-| subnet\\_flow\\_logs | Whether the subnet will record and send flow log data to logging | string | `\"false\"` | no |\n+| Name | Description | Type | Default | Required |\n+| ---------------------------- | --------------------------------------------------------------------------------------------------------------- | :----: | :----------------------: | :------: |\n+| subnet\\_name | The name of the subnet being created | string | - | yes |\n+| subnet\\_ip | The IP and CIDR range of the subnet being created | string | - | yes |\n+| subnet\\_region | The region where the subnet will be created | string | - | yes |\n+| subnet\\_private\\_access | Whether this subnet will have private Google access enabled | string | `\"false\"` | no |\n+| subnet\\_flow\\_logs | Whether the subnet will record and send flow log data to logging | string | `\"false\"` | no |\n+| subnet\\_flow\\_logs\\_interval | If subnet\\_flow\\_logs is true, sets the aggregation interval for collecting flow logs | string | `\"INTERVAL_5_SEC\"` | no |\n+| subnet\\_flow\\_logs\\_sampling | If subnet\\_flow\\_logs is true, set the sampling rate of VPC flow logs within the subnetwork | string | `\"0.5\"` | no |\n+| subnet\\_flow\\_logs\\_metadata | If subnet\\_flow\\_logs is true, configures whether metadata fields should be added to the reported VPC flow logs | string | `\"INCLUDE_ALL_METADATA\"` | no |\n+| subnet\\_flow\\_logs\\_filter_expr | Export filter defining which VPC flow logs should be logged, see https://cloud.google.com/vpc/docs/flow-logs#filtering for formatting details | string | `\"true\"` | no |\n+| purpose | The purpose of the subnet usage. Whether it is to be used as a regular subnet or for proxy or loadbalacing purposes, see https://cloud.google.com/vpc/docs/subnets#purpose for more details | string | `\"PRIVATE\"` | no |\n+| role | The role of the subnet when using it as a proxy or loadbalancer network. Whether it is to be used as the active or as a backup subnet, see https://cloud.google.com/load-balancing/docs/proxy-only-subnets#proxy_only_subnet_create for more details | string | - | no |\n---\nmodules/subnets-beta/main.tf\n@@ -37,11 +37,13 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(each.value, \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n flow_sampling = log_config.value.flow_sampling\n metadata = log_config.value.metadata\n+ filter_expr = log_config.value.filter_expr\n }\n }\n network = var.network_name\n---\nmodules/subnets/README.md\n@@ -31,6 +31,8 @@ module \"vpc\" {\n subnet_private_access = \"true\"\n subnet_flow_logs = \"true\"\n description = \"This subnet has a description\"\n+ purpose = \"INTERNAL_HTTPS_LOAD_BALANCER\"\n+ role = \"ACTIVE\"\n },\n {\n subnet_name = \"subnet-03\"\n@@ -90,3 +92,5 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_sampling | If subnet\\_flow\\_logs is true, set the sampling rate of VPC flow logs within the subnetwork | string | `\"0.5\"` | no |\n | subnet\\_flow\\_logs\\_metadata | If subnet\\_flow\\_logs is true, configures whether metadata fields should be \n-It to the reported VPC flow logs | string | `\"INCLUDE_ALL_METADATA\"` | no |\n | subnet\\_flow\\_logs\\_filter_expr | Export filter defining which VPC flow logs should be logged, see https://cloud.google.com/vpc/docs/flow-logs#filtering for formatting details | string | `\"true\"` | no |\n+| purpose | The purpose of the subnet usage. Whether it is to be used as a regular subnet or for proxy or loadbalacing purposes, see https://cloud.google.com/vpc/docs/subnets#purpose for more details | string | `\"PRIVATE\"` | no |\n+| role | The role of the subnet when using it as a proxy or loadbalancer network. Whether it is to be used as the active or as a backup subnet, see https://cloud.google.com/load-balancing/docs/proxy-only-subnets#proxy_only_subnet_create for more details | string | - | no |\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [actions/stale](https://togithub.com/actions/stale) | action | major | `v6` -> `v7` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>actions/stale</summary>\n\n### [`v7`](https://togithub.com/actions/stale/compare/v6...v7)\n\n[Compare Source](https://togithub.com/actions/stale/compare/v6...v7)\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC43My4zIiwidXBkYXRlZEluVmVyIjoiMzQuNzMuMyJ9-->\n\n\n---\n\nChoice A:\n.github/workflows/stale.yml\n@@ -21,7 +21,7 @@ jobs:\n stale:\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/stale@v6\n+ - uses: actions/stale@v7\n with:\n repo-token: ${{ secrets.GITHUB_TOKEN }}\n stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'\n---\n\n\n---\n\nChoice B:\n.github/workflows/stale.yml\n@@ -21,7 +21,7 @@ jobs:\n stale:\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/stale@v6\n+ - uses: actions/stale@v7\n with:\n ${{ repo-token: ${{ secrets.GITHUB_TOKEN }}\n stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'\n---\n\n\n---\n\nChoice C:\n.github/workflows/stale.yml\n@@ -21,7 +21,7 @@ jobs:\n stale:\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/stale@v6\n+ - uses: actions/stale@v7\n with:\n repo-token: ${{ secrets.GITHUB_TOKEN }}\n stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'\n---\n\n\n---\n\nChoice D:\n.github/workflows/stale.yml\n@@ -21,7 +21,7 @@ jobs:\n stale:\n runs-on: ubuntu-latest\n steps:\n- ubuntu-latest\n - uses: actions/stale@v6\n+ - uses: actions/stale@v7\n with:\n repo-token: ${{ secrets.GITHUB_TOKEN }}\n stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.6` -> `v0.41.7` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.7`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.7)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.6...v0.41.7)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n##### Modules affected\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n- `terraform`\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n##### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Added to terraform options parameter `SetVarsAfterVarFiles` which allows reordering var and var-file flags\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n##### Special thanks\n\n<!-- Usernames of users that contributed to this release, if the contribution was external to Gruntwork. -->\n\nSpecial thanks to the following users for their contribution!\n\n- [@​chilledornaments](https://togithub.com/chilledornaments)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_CONTRIBUTORS_NEXT -->\n\n##### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1217](https://togithub.com/gruntwork-io/terratest/pull/1217)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC43My4zIiwidXBkYXRlZEluVmVyIjoiMzQuNzMuMyJ9-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0\n-\tgithub.com/gruntwork-io/terratest v0.41.6\n+\tgithub.com/gruntwork-io/terratest v0.41.7\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -447,8 +447,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.6 h1:BlZOu8GUzLEA2aODnyszCXSoF/jgo2AuVhk41vsqUQI=\n-github.com/gruntwork-io/terratest v0.41.6/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.7 h1:Vc0hb7ajWHutGA++gu/a9FSkuf+IuQuGDRymiWdrA04=\n+github.com/gruntwork-io/terratest v0.41.7/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0\n-\tgithub.com/gruntwork-io/terratest v0.41.6\n+\tgithub.com/gruntwork-io/terratest v0.41.7\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.9.5/go.mod )\n---\ntest/integration/go.sum\n@@ -447,8 +447,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.6 h1:BlZOu8GUzLEA2aODnyszCXSoF/jgo2AuVhk41vsqUQI=\n-github.com/gruntwork-io/terratest v0.41.6/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.7 h1:Vc0hb7ajWHutGA++gu/a9FSkuf+IuQuGDRymiWdrA04=\n+github.com/gruntwork-io/terratest v0.41.7/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0\n-\tgithub.com/gruntwork-io/terratest v0.41.6\n+\tgithub.com/gruntwork-io/terratest v0.41.7\n \tgithub.com/stretchr/testify github.com/hashicorp/consul/sdk \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -447,8 +447,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.6 h1:BlZOu8GUzLEA2aODnyszCXSoF/jgo2AuVhk41vsqUQI=\n-github.com/gruntwork-io/terratest v0.41.6/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.7 h1:Vc0hb7ajWHutGA++gu/a9FSkuf+IuQuGDRymiWdrA04=\n+github.com/gruntwork-io/terratest v0.41.7/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0\n-\tgithub.com/gruntwork-io/terratest v0.41.6\n+\tgithub.com/gruntwork-io/terratest v0.41.7\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -447,8 +447,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest github.com/hashicorp/consul/api h1:BlZOu8GUzLEA2aODnyszCXSoF/jgo2AuVhk41vsqUQI=\n-github.com/gruntwork-io/terratest v0.41.6/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.7 h1:Vc0hb7ajWHutGA++gu/a9FSkuf+IuQuGDRymiWdrA04=\n+github.com/gruntwork-io/terratest v0.41.7/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.4` -> `v0.41.6` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.6`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.6)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.5...v0.41.6)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n#### Modules affected\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n- `k8s`\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n#### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Add support for Kubernetes configmaps\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n#### Special thanks\n\n<!-- Usernames of users that contributed to this release, if the contribution was external to Gruntwork. -->\n\nSpecial thanks to the following users for their contribution!\n\n- [@​abrahamjoc](https://togithub.com/abrahamjoc)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_CONTRIBUTORS_NEXT -->\n\n#### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1214](https://togithub.com/gruntwork-io/terratest/pull/1214)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.41.5`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.5)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.4...v0.41.5)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n#### Modules affected\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n- `aws`\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n#### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Added support to get and put ECR Lifecycle Policy\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n#### Special thanks\n\n<!-- Usernames of users that contributed to this release, if the contribution was external to Gruntwork. -->\n\nSpecial thanks to the following users for their contribution!\n\n- [@​cauealvesbraz](https://togithub.com/cauealvesbraz)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_CONTRIBUTORS_NEXT -->\n\n#### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1198](https://togithub.com/gruntwork-io/terratest/pull/1198)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC42Mi4xIiwidXBkYXRlZEluVmVyIjoiMzQuNjIuMSJ9-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0\n-\tgithub.com/gruntwork-io/terratest v0.41.4\n+\tgithub.com/gruntwork-io/terratest v0.41.6\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -447,8 +447,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.4 h1:mJUi6vHizPqgvRcRQe4MKP8BhTS3Lxi55uJYKLOqRt4=\n-github.com/gruntwork-io/terratest v0.41.4/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.6 h1:BlZOu8GUzLEA2aODnyszCXSoF/jgo2AuVhk41vsqUQI=\n+github.com/gruntwork-io/terratest v0.41.6/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0\n-\tgithub.com/gruntwork-io/terratest v0.41.4\n+\tgithub.com/gruntwork-io/terratest v0.41.6\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n v1.8.1\n -447,8 +447,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.4 h1:mJUi6vHizPqgvRcRQe4MKP8BhTS3Lxi55uJYKLOqRt4=\n-github.com/gruntwork-io/terratest v0.41.4/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.6 h1:BlZOu8GUzLEA2aODnyszCXSoF/jgo2AuVhk41vsqUQI=\n+github.com/gruntwork-io/terratest v0.41.6/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0\n-\tgithub.com/gruntwork-io/terratest v0.41.4\n+\tgithub.com/gruntwork-io/terratest v0.41.6\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -447,8 +447,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n v0.41.6\n v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.4 h1:mJUi6vHizPqgvRcRQe4MKP8BhTS3Lxi55uJYKLOqRt4=\n-github.com/gruntwork-io/terratest v0.41.4/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.6 h1:BlZOu8GUzLEA2aODnyszCXSoF/jgo2AuVhk41vsqUQI=\n+github.com/gruntwork-io/terratest v0.41.6/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0\n-\tgithub.com/gruntwork-io/terratest v0.41.4\n+\tgithub.com/gruntwork-io/terratest v0.41.6\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -447,8 +447,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v0.41.6 h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.40.7/go.mod h1:CjHsEgP1Pe987X5N8K5qEqCuLtu1bqERGIAF8bTj1s0=\n-github.com/gruntwork-io/terratest v0.41.4 h1:mJUi6vHizPqgvRcRQe4MKP8BhTS3Lxi55uJYKLOqRt4=\n-github.com/gruntwork-io/terratest v0.41.4/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.6 h1:BlZOu8GUzLEA2aODnyszCXSoF/jgo2AuVhk41vsqUQI=\n+github.com/gruntwork-io/terratest v0.41.6/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=\n github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=\n github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change | Pending |\n|---|---|---|---|---|\n| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit) | require | minor | `v0.0.0-20211001192917-5e783cf7c716` -> `v0.4.0` | |\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.3` -> `v0.41.4` | `v0.41.6` (+1) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>GoogleCloudPlatform/cloud-foundation-toolkit</summary>\n\n### [`v0.4.0`](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/releases/tag/v0.4.0): CLI Release v0.4.0\n\n</details>\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.4`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.4)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.3...v0.41.4)\n\n<!--\n -- This is autogenerated from the release notes drafter. When updating, be sure to double check some of the changes\n -- before publishing.\n -- Note that there are markers for the release notes drafter as comments. DO NOT REMOVE THEM. They will not show up in\n -- the preview and is harmless to keep, but harmful to remove as it is used to guide the drafter on where the next\n -- information should be inserted.\n -->\n\n#### Modules affected\n\n<!-- The list of modules that have been touched since the last release.\n --\n -- The autogenerator will choose to do a patch release. However, check if the changes in the following modules are\n -- backwards compatible, and update the release number if it is backwards incompatible.\n --\n -- The following kinds of changes would constitute a backwards incompatible change:\n -- * In Terraform code: add a new variable without a default, rename or remove an existing variable, remove or rename\n -- an output, remove or rename a resource.\n -- * In Bash and Go code: add a new parameter without a default, rename or remove an existing parameter, fundamentally\n -- change what the code does.\n -->\n\n- `k8s`\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_MODULES_AFFECTED_NEXT -->\n\n#### Description\n\n<!-- A description of the changes made in this release. Be sure to update any TODOs. -->\n\n- Add support for Kubernetes network policies\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_DESCRIPTIONS_NEXT -->\n\n#### Special thanks\n\n<!-- Usernames of users that contributed to this release, if the contribution was external to Gruntwork. -->\n\nSpecial thanks to the following users for their contribution!\n\n- [@​baquintanag](https://togithub.com/baquintanag)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_CONTRIBUTORS_NEXT -->\n\n#### Related links\n\n<!-- Links to each PR or issue that are being addressed in this release. The drafter will autoinclude each merged PR. -->\n\n- [https://github.com/gruntwork-io/terratest/pull/1208](https://togithub.com/gruntwork-io/terratest/pull/1208)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\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://togithub.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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC41MS4wIiwidXBkYXRlZEluVmVyIjoiMzQuNTQuMCJ9-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.18\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n-\tgithub.com/gruntwork-io/terratest v0.41.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0\n+\tgithub.com/gruntwork-io/terratest // \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n@@ -47,6 +47,7 @@ require (\n \tgithub.com/pmezard/go-difflib v1.0.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n \tgithub.com/tidwall/pretty v1.2.0 // indirect\n+\tgithub.com/tidwall/sjson v1.2.4 // indirect\n \tgithub.com/tmccombs/hcl2json v0.3.3 // indirect\n \tgithub.com/ulikunitz/xz v0.5.8 // indirect\n \tgithub.com/zclconf/go-cty v1.9.1 // indirect\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.18\n go require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n-\tgithub.com/gruntwork-io/terratest v0.41.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0\n+\tgithub.com/gruntwork-io/terratest v0.41.4\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n@@ -47,6 +47,7 @@ require (\n \tgithub.com/pmezard/go-difflib v1.0.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n \tgithub.com/tidwall/pretty v1.2.0 // indirect\n+\tgithub.com/tidwall/sjson v1.2.4 // indirect\n \tgithub.com/tmccombs/hcl2json v0.3.3 // indirect\n \tgithub.com/ulikunitz/xz v0.5.8 // indirect\n \tgithub.com/zclconf/go-cty v1.9.1 // indirect\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.18\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n-\tgithub.com/gruntwork-io/terratest v0.41.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0\n+\tgithub.com/gruntwork-io/terratest v0.41.4\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n@@ -47,6 +47,7 @@ require (\n \tgithub.com/pmezard/go-difflib v1.0.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n \tgithub.com/tidwall/pretty v1.2.0 // indirect\n+\tgithub.com/tidwall/sjson v1.2.4 // indirect\n \tgithub.com/tmccombs/hcl2json v0.3.3 // indirect\n \tgithub.com/ulikunitz/xz v0.5.8 // indirect\n \tgithub.com/zclconf/go-cty v1.9.1 // indirect\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.18\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n-\tgithub.com/gruntwork-io/terratest v0.41.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0\n+\tgithub.com/gruntwork-io/terratest v0.41.4\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.4\n )\n@@ -47,6 +47,7 @@ require (\n \tgithub.com/pmezard/go-difflib v1.0.0 // indirect\n \tgithub.com/tidwall/match v1.1.1 // indirect\n \tgithub.com/tidwall/pretty v1.2.0 // indirect\n+\tgithub.com/tidwall/sjson v1.2.4 // // \tgithub.com/tmccombs/hcl2json v0.3.3 // indirect\n \tgithub.com/ulikunitz/xz v0.5.8 // indirect\n \tgithub.com/zclconf/go-cty v1.9.1 // indirect\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [github.com/tidwall/gjson](https://togithub.com/tidwall/gjson) | require | patch | `v1.14.3` -> `v1.14.4` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>tidwall/gjson</summary>\n\n### [`v1.14.4`](https://togithub.com/tidwall/gjson/compare/v1.14.3...v1.14.4)\n\n[Compare Source](https://togithub.com/tidwall/gjson/compare/v1.14.3...v1.14.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🔕 **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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC40MC4yIiwidXBkYXRlZEluVmVyIjoiMzQuNDAuMiJ9-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n \tgithub.com/gruntwork-io/terratest v0.41.3\n \tgithub.com/stretchr/testify v1.8.1\n-\tgithub.com/tidwall/gjson v1.14.3\n+\tgithub.com/tidwall/gjson v1.14.4\n )\n \n require (\n---\ntest/integration/go.sum\n@@ -601,8 +601,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO\n github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=\n-github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw=\n-github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=\n+github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n \tgithub.com/gruntwork-io/terratest v0.41.3\n \tgithub.com/stretchr/testify v1.8.1\n-\tgithub.com/tidwall/gjson v1.14.3\n+\tgithub.com/tidwall/gjson v1.14.4\n )\n \n require (\n---\ntest/integration/go.sum\n@@ -601,8 +601,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO\n github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=\n-github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw=\n-github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=\n+github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n \tgithub.com/gruntwork-io/terratest v0.41.3\n \tgithub.com/stretchr/testify v1.8.1\n-\tgithub.com/tidwall/gjson v1.14.3\n+\tgithub.com/tidwall/gjson v1.14.4\n )\n \n require (\n---\ntest/integration/go.sum\n@@ v1.8.1/go.mod +601,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO\n github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=\n-github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw=\n-github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=\n+github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n \tgithub.com/gruntwork-io/terratest v0.41.3\n \tgithub.com/stretchr/testify v1.8.1\n-\tgithub.com/tidwall/gjson v1.14.3\n+\tgithub.com/tidwall/gjson v1.14.4\n )\n \n require (\n---\ntest/integration/go.sum\n@@ -601,8 +601,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO\n github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=\n-github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw=\n-github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=\n+github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod )\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\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://togithub.com/terraform-google-modules/terraform-google-network)) | module | major | `~> 5.2` -> `~> 6.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-network</summary>\n\n### [`v6.0.0`](https://togithub.com/terraform-google-modules/terraform-google-network/blob/HEAD/CHANGELOG.md#​600-httpsgithubcomterraform-google-modulesterraform-google-networkcomparev520v600-2022-11-21)\n\n[Compare Source](https://togithub.com/terraform-google-modules/terraform-google-network/compare/v5.2.0...v6.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- update minimum TPG version to 3.33 for firewall-rules [#​381](https://togithub.com/terraform-google-modules/terraform-google-network/issues/381)\n- increase subnets module minimum TPG to 2.15 ([#​377](https://togithub.com/terraform-google-modules/terraform-google-network/issues/377))\n\n##### Bug Fixes\n\n- increase subnets module minimum TPG to 2.15 ([#​377](https://togithub.com/terraform-google-modules/terraform-google-network/issues/377)) ([3978cf1](https://togithub.com/terraform-google-modules/terraform-google-network/commit/3978cf1c5d834e158423ce525f6782e4550e1c23))\n- update minimum TPG version to 3.33 for firewall-rules [#​381](https://togithub.com/terraform-google-modules/terraform-google-network/issues/381) ([0640fdd](https://togithub.com/terraform-google-modules/terraform-google-network/commit/0640fdd36173d196054135c997f0feba851fb4a3))\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 becomes conflicted, 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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC40MC4yIiwidXBkYXRlZEluVmVyIjoiMzQuNDAuMiJ9-->\n\n\n---\n\nChoice A:\ncodelabs/simple/main.tf\n@@ -25,7 +25,7 @@ resource \"google_project_service\" \"compute\" {\n # Create the network\n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n \n # Give the network a name and project\n project_id = google_project_service.compute.project\n---\nexamples/basic_vpc_peering/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_peering_create]\n module \"peering1\" {\n source = \"terraform-google-modules/network/google//modules/network-peering\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n local_network = var.local_network # Replace with self link to VPC network \"foobar\" in quotes\n peer_network = var.peer_network # Replace with self link to VPC network \"other\" in quotes\n }\n---\nexamples/private_service_connect/main.tf\n@@ -30,7 +30,7 @@ module \"private_service_connect\" {\n \n module \"simple_vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n network_name = \"my-custom-network\"\n mtu = 1460\n---\nexamples/routes/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_static_route_create]\n module \"google_compute_route\" {\n source = \"terraform-google-modules/network/google//modules/routes\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"default\"\n \n---\nexamples/simple_project/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_custom_create]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-custom-mode-network\"\n mtu = 1460\n---\nexamples/submodule_vpc_serverless_connector/main.tf\n@@ -24,7 +24,7 @@ resource \"google_project_service\" \"vpcaccess-api\" {\n # [START vpc_serverless_connector]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-serverless-network\"\n mtu = 1460\n---\n\n\n---\n\nChoice B:\ncodelabs/simple/main.tf\n@@ -25,7 +25,7 @@ resource \"google_project_service\" \"compute\" {\n # Create the network\n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n \n # Give the network a name and project\n project_id = google_project_service.compute.project\n---\nexamples/basic_vpc_peering/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_peering_create]\n module \"peering1\" {\n source = \"terraform-google-modules/network/google//modules/network-peering\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n local_network = var.local_network # +30,7 with self link to VPC network \"foobar\" in quotes\n peer_network = var.peer_network # Replace with self link to VPC network \"other\" in quotes\n }\n---\nexamples/private_service_connect/main.tf\n@@ -30,7 +30,7 @@ module \"private_service_connect\" {\n \n module \"simple_vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n network_name = \"my-custom-network\"\n mtu = 1460\n---\nexamples/routes/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_static_route_create]\n module \"google_compute_route\" {\n source = \"terraform-google-modules/network/google//modules/routes\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"default\"\n \n---\nexamples/simple_project/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_custom_create]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-custom-mode-network\"\n mtu = 1460\n---\nexamples/submodule_vpc_serverless_connector/main.tf\n@@ -24,7 +24,7 @@ resource \"google_project_service\" \"vpcaccess-api\" {\n # [START vpc_serverless_connector]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-serverless-network\"\n mtu = 1460\n---\n\n\n---\n\nChoice C:\ncodelabs/simple/main.tf\n@@ -25,7 +25,7 @@ resource \"google_project_service\" \"compute\" {\n # Create the network\n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n \n # Give the network a name and project\n project_id = google_project_service.compute.project\n---\nexamples/basic_vpc_peering/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_peering_create]\n module \"peering1\" {\n source = \"terraform-google-modules/network/google//modules/network-peering\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n local_network = var.local_network # Replace with self link to VPC network \"foobar\" in quotes\n peer_network = var.peer_network # Replace with self link to VPC network \"other\" in quotes\n }\n---\nexamples/private_service_connect/main.tf\n@@ -30,7 +30,7 @@ module \"private_service_connect\" {\n \n module \"simple_vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n network_name = \"my-custom-network\"\n mtu = 1460\n---\nexamples/routes/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_static_route_create]\n module \"google_compute_route\" {\n source = \"terraform-google-modules/network/google//modules/routes\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"default\"\n \n---\nexamples/simple_project/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_custom_create]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-custom-mode-network\"\n mtu = 1460\n---\nexamples/submodule_vpc_serverless_connector/main.tf\n@@ -24,7 +24,7 @@ resource \"google_project_service\" \"vpcaccess-api\" {\n # [START vpc_serverless_connector]\n module \"test-vpc-module\" {\n = source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-serverless-network\"\n mtu = 1460\n---\n\n\n---\n\nChoice D:\ncodelabs/simple/main.tf\n@@ -25,7 +25,7 @@ resource \"google_project_service\" \"compute\" {\n # Create the network\n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n \n # Give the network a name and project\n project_id = google_project_service.compute.project\n---\nexamples/basic_vpc_peering/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_peering_create]\n module \"peering1\" {\n source = \"terraform-google-modules/network/google//modules/network-peering\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n local_network = var.local_network # Replace with self link to VPC network \"foobar\" in quotes\n peer_network = var.peer_network # Replace with self link to VPC network \"other\" in quotes\n }\n---\nexamples/private_service_connect/main.tf\n@@ -30,7 +30,7 @@ module \"private_service_connect\" {\n \n module \"simple_vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n network_name = \"my-custom-network\"\n mtu = 1460\n---\nexamples/routes/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_static_route_create]\n module \"google_compute_route\" {\n source = \"terraform-google-modules/network/google//modules/routes\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"default\"\n \n---\nexamples/simple_project/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_custom_create]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-custom-mode-network\"\n mtu = 1460\n---\nexamples/submodule_vpc_serverless_connector/main.tf\n@@ -24,7 +24,7 @@ resource \"google_project_service\" \"vpcaccess-api\" {\n # [START vpc_serverless_connector]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 5.2\"\n+ version = \"~> 6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-serverless-network\"\n mtu = 1460\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.0` -> `v0.41.3` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.3`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.3)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.2...v0.41.3)\n\n#### What's Changed\n\n- Fix project-name so it doesn't contain special characters for docker-… by [@​hongil0316](https://togithub.com/hongil0316) in [https://github.com/gruntwork-io/terratest/pull/1203](https://togithub.com/gruntwork-io/terratest/pull/1203)\n- fix formatting and imports by [@​ellisonc](https://togithub.com/ellisonc) in [https://github.com/gruntwork-io/terratest/pull/1202](https://togithub.com/gruntwork-io/terratest/pull/1202)\n\n**Full Changelog**: https://github.com/gruntwork-io/terratest/compare/v0.41.2...v0.41.3\n\n### [`v0.41.2`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.2)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.0...v0.41.2)\n\n##### What's Changed\n\n- support buildkit for dockcer-compose by [@​hongil0316](https://togithub.com/hongil0316) in [https://github.com/gruntwork-io/terratest/pull/1201](https://togithub.com/gruntwork-io/terratest/pull/1201)\n\n**Full Changelog**: https://github.com/gruntwork-io/terratest/compare/v0.41.01...v0.41.2\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 becomes conflicted, 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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4zMy4xIiwidXBkYXRlZEluVmVyIjoiMzQuMzQuMSJ9-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n-\tgithub.com/gruntwork-io/terratest v0.41.0\n+\tgithub.com/gruntwork-io/terratest v0.41.3\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.3\n )\n---\ntest/integration/go.sum\n@@ -372,8 +372,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.35.6/go.mod h1:GIVJGBV1WIv1vxIG31Ycy0CuHYfXuvvkilNQuC9Wi+o=\n-github.com/gruntwork-io/terratest v0.41.0 h1:QKFK6m0EMVnrV7lw2L06TlG+Ha3t0CcOXuBVywpeNRU=\n-github.com/gruntwork-io/terratest v0.41.0/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.3 h1:LYhFuTlcBCKAOz3dLIN+mcQN1Kbjn8pXpktnxG0eg5c=\n+github.com/gruntwork-io/terratest v0.41.3/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=\n -372,8 v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n-\tgithub.com/gruntwork-io/terratest v0.41.0\n+\tgithub.com/gruntwork-io/terratest v0.41.3\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.3\n )\n---\ntest/integration/go.sum\n@@ -372,8 +372,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.35.6/go.mod h1:GIVJGBV1WIv1vxIG31Ycy0CuHYfXuvvkilNQuC9Wi+o=\n-github.com/gruntwork-io/terratest v0.41.0 h1:QKFK6m0EMVnrV7lw2L06TlG+Ha3t0CcOXuBVywpeNRU=\n-github.com/gruntwork-io/terratest v0.41.0/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.3 v0.41.3\n v0.41.3/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n-\tgithub.com/gruntwork-io/terratest h1:LYhFuTlcBCKAOz3dLIN+mcQN1Kbjn8pXpktnxG0eg5c=\n+github.com/gruntwork-io/terratest v0.41.3\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.3\n )\n---\ntest/integration/go.sum\n@@ -372,8 +372,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.35.6/go.mod h1:GIVJGBV1WIv1vxIG31Ycy0CuHYfXuvvkilNQuC9Wi+o=\n-github.com/gruntwork-io/terratest v0.41.0 h1:QKFK6m0EMVnrV7lw2L06TlG+Ha3t0CcOXuBVywpeNRU=\n-github.com/gruntwork-io/terratest v0.41.0/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.3 h1:LYhFuTlcBCKAOz3dLIN+mcQN1Kbjn8pXpktnxG0eg5c=\n+github.com/gruntwork-io/terratest v0.41.3/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n-\tgithub.com/gruntwork-io/terratest v0.41.0\n+\tgithub.com/gruntwork-io/terratest v0.41.3\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.3\n )\n---\ntest/integration/go.sum\n@@ -372,8 +372,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.35.6/go.mod h1:GIVJGBV1WIv1vxIG31Ycy0CuHYfXuvvkilNQuC9Wi+o=\n-github.com/gruntwork-io/terratest v0.41.0 h1:QKFK6m0EMVnrV7lw2L06TlG+Ha3t0CcOXuBVywpeNRU=\n-github.com/gruntwork-io/terratest v0.41.0/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n+github.com/gruntwork-io/terratest v0.41.3 h1:LYhFuTlcBCKAOz3dLIN+mcQN1Kbjn8pXpktnxG0eg5c=\n+github.com/gruntwork-io/terratest v0.41.3/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n`terraform init` was failing when using the source from the README.\r\n\r\nBEGIN_COMMIT_OVERRIDE\r\nchore: README.md typo #405\r\nEND_COMMIT_OVERRIDE\n\n---\n\nChoice A:\nmodules/private-service-connect/README.md\n@@ -16,7 +16,7 @@ Basic usage of this module is as follows:\n \n ```hcl\n module \"private_service_connect\" {\n- source = \"terraform-google-modules/network/google//modules/private_service_connect\"\n+ source = \"terraform-google-modules/network/google//modules/private-service-connect\"\n \n project_id = \"<PROJECT_ID>\"\n network_self_link = \"<NETWORK_SELF_LINK>\"\n---\n\n\n---\n\nChoice B:\nmodules/private-service-connect/README.md\n@@ -16,7 +16,7 @@ Basic usage of this module is as follows:\n \n ```hcl\n module \"private_service_connect\" {\n- source = \"terraform-google-modules/network/google//modules/private_service_connect\"\n+ source = \"terraform-google-modules/network/google//modules/private-service-connect\"\n \n project_id = \"<PROJECT_ID>\"\n network_self_link = \"<NETWORK_SELF_LINK>\"\n---\n\n\n---\n\nChoice C:\nmodules/private-service-connect/README.md\n@@ -16,7 +16,7 @@ Basic usage of this module is as follows:\n \n ```hcl\n module \"private_service_connect\" {\n- source = \"terraform-google-modules/network/google//modules/private_service_connect\"\n+ source = \"terraform-google-modules/network/google//modules/private-service-connect\"\n \n project_id = \"<PROJECT_ID>\"\n network_self_link = \"<NETWORK_SELF_LINK>\"\n---\n\n\n---\n\nChoice D:\nmodules/private-service-connect/README.md\n@@ -16,7 +16,7 @@ Basic usage of this module is as follows:\n \n ```hcl\n module \"private_service_connect\" {\n- source = \"terraform-google-modules/network/google//modules/private_service_connect\"\n+ source = \"terraform-google-modules/network/google//modules/private-service-connect\"\n \n project_id = \"<PROJECT_ID>\"\n network_self_link = \"<NETWORK_SELF_LINK>\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network 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## [6.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.2.0...v6.0.0) (2022-11-21)\n\n\n### ⚠ BREAKING CHANGES\n\n* update minimum TPG version to 3.33 for firewall-rules #381\n* increase subnets module minimum TPG to 2.15 (#377)\n\n### Bug Fixes\n\n* increase subnets module minimum TPG to 2.15 ([#377](https://github.com/terraform-google-modules/terraform-google-network/issues/377)) ([3978cf1](https://github.com/terraform-google-modules/terraform-google-network/commit/3978cf1c5d834e158423ce525f6782e4550e1c23))\n* update minimum TPG version to 3.33 for firewall-rules [#381](https://github.com/terraform-google-modules/terraform-google-network/issues/381) ([0640fdd](https://github.com/terraform-google-modules/terraform-google-network/commit/0640fdd36173d196054135c997f0feba851fb4a3))\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@@ -2,6 +2,19 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [6.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.2.0...v6.0.0) (2022-11-21)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* update minimum TPG version to 3.33 for firewall-rules #381\n+* increase subnets module minimum TPG to 2.15 (#377)\n+\n+### Bug Fixes\n+\n+* increase subnets module minimum TPG to 2.15 ([#377](https://github.com/terraform-google-modules/terraform-google-network/issues/377)) ([3978cf1](https://github.com/terraform-google-modules/terraform-google-network/commit/3978cf1c5d834e158423ce525f6782e4550e1c23))\n+* update minimum TPG version to 3.33 for firewall-rules [#381](https://github.com/terraform-google-modules/terraform-google-network/issues/381) ([0640fdd](https://github.com/terraform-google-modules/terraform-google-network/commit/0640fdd36173d196054135c997f0feba851fb4a3))\n+\n ## [5.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.1.0...v5.2.0) (2022-07-28)\n \n \n---\nREADME.md\n@@ -25,7 +25,7 @@ You can go to the examples folder, however the usage of the module could be like\n ```hcl\n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 4.0\"\n+ version = \"~> 6.0\"\n \n project_id = \"<PROJECT ID>\"\n network_name = \"example-vpc\"\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v6.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v6.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v6.0.0\"\n }\n }\n---\nmodules/private-service-connect/versions.tf\n@@ -28,10 +28,10 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v6.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v6.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v6.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v6.0.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v6.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v5.2.0\"\n+ module_name = }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,19 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [6.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.2.0...v6.0.0) (2022-11-21)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* update minimum TPG version to 3.33 for firewall-rules #381\n+* increase subnets module minimum TPG to 2.15 (#377)\n+\n+### Bug Fixes\n+\n+* increase subnets module minimum TPG to 2.15 ([#377](https://github.com/terraform-google-modules/terraform-google-network/issues/377)) ([3978cf1](https://github.com/terraform-google-modules/terraform-google-network/commit/3978cf1c5d834e158423ce525f6782e4550e1c23))\n+* update minimum TPG version to 3.33 for firewall-rules [#381](https://github.com/terraform-google-modules/terraform-google-network/issues/381) ([0640fdd](https://github.com/terraform-google-modules/terraform-google-network/commit/0640fdd36173d196054135c997f0feba851fb4a3))\n+\n ## [5.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.1.0...v5.2.0) (2022-07-28)\n \n \n---\nREADME.md\n@@ -25,7 +25,7 @@ You can go to the examples folder, however the usage of the module could be like\n ```hcl\n module \"vpc\" {\n }\n = \"terraform-google-modules/network/google\"\n- version = \"~> 4.0\"\n+ version = \"~> 6.0\"\n \n project_id = \"<PROJECT ID>\"\n network_name = \"example-vpc\"\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v6.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v6.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v6.0.0\"\n }\n }\n---\nmodules/private-service-connect/versions.tf\n@@ -28,10 +28,10 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v6.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v6.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v6.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v6.0.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v6.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v6.0.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,19 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [6.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.2.0...v6.0.0) (2022-11-21)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* update minimum TPG version to 3.33 for firewall-rules #381\n+* increase subnets module minimum TPG to 2.15 (#377)\n+\n+### Bug Fixes\n+\n+* increase subnets module minimum TPG to 2.15 ([#377](https://github.com/terraform-google-modules/terraform-google-network/issues/377)) ([3978cf1](https://github.com/terraform-google-modules/terraform-google-network/commit/3978cf1c5d834e158423ce525f6782e4550e1c23))\n+* update minimum TPG version to 3.33 for firewall-rules [#381](https://github.com/terraform-google-modules/terraform-google-network/issues/381) ([0640fdd](https://github.com/terraform-google-modules/terraform-google-network/commit/0640fdd36173d196054135c997f0feba851fb4a3))\n+\n ## [5.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.1.0...v5.2.0) (2022-07-28)\n \n \n---\nREADME.md\n@@ -25,7 +25,7 @@ You can go to the examples folder, however the usage of the module could be like\n ```hcl\n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 4.0\"\n+ version = \"~> 6.0\"\n \n project_id = \"<PROJECT ID>\"\n network_name = \"example-vpc\"\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v6.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v6.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v6.0.0\"\n }\n }\n---\nmodules/private-service-connect/versions.tf\n@@ -28,10 +28,10 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v6.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v6.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v6.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v6.0.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v6.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v6.0.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,19 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [6.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.2.0...v6.0.0) (2022-11-21)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* update minimum TPG version to 3.33 for firewall-rules #381\n+* increase subnets module minimum TPG to 2.15 (#377)\n+\n+### Bug Fixes\n+\n+* increase subnets module minimum TPG to 2.15 ([#377](https://github.com/terraform-google-modules/terraform-google-network/issues/377)) ([3978cf1](https://github.com/terraform-google-modules/terraform-google-network/commit/3978cf1c5d834e158423ce525f6782e4550e1c23))\n+* update minimum TPG version to 3.33 for firewall-rules [#381](https://github.com/terraform-google-modules/terraform-google-network/issues/381) ([0640fdd](https://github.com/terraform-google-modules/terraform-google-network/commit/0640fdd36173d196054135c997f0feba851fb4a3))\n+\n ## [5.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.1.0...v5.2.0) (2022-07-28)\n \n \n---\nREADME.md\n@@ -25,7 +25,7 @@ You can go to the examples folder, however the usage of the module could be like\n ```hcl\n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 4.0\"\n+ version = \"~> 6.0\"\n \n project_id = \"<PROJECT ID>\"\n network_name = \"example-vpc\"\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta +28,10 {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v6.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v6.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v6.0.0\"\n }\n }\n---\nmodules/private-service-connect/versions.tf\n@@ -28,10 +28,10 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v6.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v6.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v6.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v6.0.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v6.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v5.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v6.0.0\"\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nFixes #380\r\n\r\nBEGIN_COMMIT_OVERRIDE\r\nfix!: update minimum TPG version to 3.33 for firewall-rules #381\r\nEND_COMMIT_OVERRIDE\n\n---\n\nChoice A:\nmodules/firewall-rules/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"<5.0,>= 2.12\"\n+ +20,7 version = \"<5.0,>= 3.33\"\n }\n }\n \n---\n\n\n---\n\nChoice B:\nmodules/firewall-rules/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- modules/firewall-rules/versions.tf\n@@ version = \"<5.0,>= 2.12\"\n+ version = \"<5.0,>= 3.33\"\n }\n }\n \n---\n\n\n---\n\nChoice C:\nmodules/firewall-rules/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"<5.0,>= 2.12\"\n+ version = \"<5.0,>= 3.33\"\n }\n }\n \n---\n\n\n---\n\nChoice D:\nmodules/firewall-rules/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"<5.0,>= 2.12\"\n+ version \"<5.0,>= 3.33\"\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\r\n\r\nThis PR contains the following updates:\r\n\r\n| Package | Type | Update | Change | Pending |\r\n|---|---|---|---|---|\r\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | minor | `v0.40.24` -> `v0.41.0` | `v0.41.3` (+1) |\r\n\r\n---\r\n\r\n### Release Notes\r\n\r\n<details>\r\n<summary>gruntwork-io/terratest</summary>\r\n\r\n### [`v0.41.0`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.0)\r\n\r\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.40.24...v0.41.0)\r\n\r\n#### What's Changed\r\n\r\nTerratest now requires Go version 1.18 at a minimum. This is backward incompatible - if you are using an older version of G, you will need to update the Go version in your environment prior to updating to this version.\r\n\r\n- Bump Go to 1.18 by [@​infraredgirl](https://togithub.com/infraredgirl) in [https://github.com/gruntwork-io/terratest/pull/1196](https://togithub.com/gruntwork-io/terratest/pull/1196)\r\n\r\n**Full Changelog**: https://github.com/gruntwork-io/terratest/compare/v0.40.24...v0.41.0\r\n\r\n</details>\r\n\r\n---\r\n\r\n### Configuration\r\n\r\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\r\n\r\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\r\n\r\n♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.\r\n\r\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\r\n\r\n---\r\n\r\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\r\n\r\n---\r\n\r\nThis PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\r\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4yNi4yIiwidXBkYXRlZEluVmVyIjoiMzQuMjcuMyJ9-->\r\n\r\nBEGIN_COMMIT_OVERRIDE\r\nchore(deps): update module github.com/gruntwork-io/terratest to v0.41.0 #404\r\nEND_COMMIT_OVERRIDE\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n-\tgithub.com/gruntwork-io/terratest v0.40.24\n+\tgithub.com/gruntwork-io/terratest v0.41.0\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.3\n )\n---\ntest/integration/go.sum\n@@ -372,8 +372,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.35.6/go.mod h1:GIVJGBV1WIv1vxIG31Ycy0CuHYfXuvvkilNQuC9Wi+o=\n-github.com/gruntwork-io/terratest v0.40.24 h1:vxVi714rX+joBLrxBVnbMzSYQ2srIfXzjqvImHl6Rtk=\n-github.com/gruntwork-io/terratest v0.40.24/go.mod h1:JGeIGgLbxbG9/Oqm06z6YXVr76CfomdmLkV564qov+8=\n+github.com/gruntwork-io/terratest v0.41.0 h1:QKFK6m0EMVnrV7lw2L06TlG+Ha3t0CcOXuBVywpeNRU=\n+github.com/gruntwork-io/terratest v0.41.0/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n-\tgithub.com/gruntwork-io/terratest v0.40.24\n+\tgithub.com/gruntwork-io/terratest v0.41.0\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.3\n )\n---\ntest/integration/go.sum\n@@ -372,8 +372,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.35.6/go.mod h1:GIVJGBV1WIv1vxIG31Ycy0CuHYfXuvvkilNQuC9Wi+o=\n-github.com/gruntwork-io/terratest v0.40.24 h1:vxVi714rX+joBLrxBVnbMzSYQ2srIfXzjqvImHl6Rtk=\n-github.com/gruntwork-io/terratest v0.40.24/go.mod h1:JGeIGgLbxbG9/Oqm06z6YXVr76CfomdmLkV564qov+8=\n+github.com/gruntwork-io/terratest v0.41.0 \tgithub.com/stretchr/testify v0.41.0/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n-\tgithub.com/gruntwork-io/terratest v0.40.24\n+\tgithub.com/gruntwork-io/terratest v0.41.0\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.3\n )\n---\ntest/integration/go.sum\n@@ -372,8 +372,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.35.6/go.mod h1:GIVJGBV1WIv1vxIG31Ycy0CuHYfXuvvkilNQuC9Wi+o=\n-github.com/gruntwork-io/terratest v0.40.24 h1:vxVi714rX+joBLrxBVnbMzSYQ2srIfXzjqvImHl6Rtk=\n-github.com/gruntwork-io/terratest v0.40.24/go.mod 1.18\n v0.41.0 h1:QKFK6m0EMVnrV7lw2L06TlG+Ha3t0CcOXuBVywpeNRU=\n+github.com/gruntwork-io/terratest v0.41.0/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n-\tgithub.com/gruntwork-io/terratest v0.40.24\n+\tgithub.com/gruntwork-io/terratest v0.41.0\n \tgithub.com/stretchr/testify v1.8.1\n \tgithub.com/tidwall/gjson v1.14.3\n )\n---\ntest/integration/go.sum\n@@ -372,8 +372,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t\n github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=\n github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78=\n github.com/gruntwork-io/terratest v0.35.6/go.mod h1:GIVJGBV1WIv1vxIG31Ycy0CuHYfXuvvkilNQuC9Wi+o=\n-github.com/gruntwork-io/terratest v0.40.24 h1:vxVi714rX+joBLrxBVnbMzSYQ2srIfXzjqvImHl6Rtk=\n-github.com/gruntwork-io/terratest v0.40.24/go.mod h1:JGeIGgLbxbG9/Oqm06z6YXVr76CfomdmLkV564qov+8=\n+github.com/gruntwork-io/terratest v0.41.0 h1:QKFK6m0EMVnrV7lw2L06TlG+Ha3t0CcOXuBVywpeNRU=\n+github.com/gruntwork-io/terratest v0.41.0/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI=\n github.com/hashicorp/errwrap -4,7 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\r\n\r\nThis PR contains the following updates:\r\n\r\n| Package | Type | Update | Change |\r\n|---|---|---|---|\r\n| [null](https://registry.terraform.io/providers/hashicorp/null) ([source](https://togithub.com/hashicorp/terraform-provider-null)) | required_provider | major | `~> 2.1` -> `~> 3.0` |\r\n\r\n---\r\n\r\n### Release Notes\r\n\r\n<details>\r\n<summary>hashicorp/terraform-provider-null</summary>\r\n\r\n### [`v3.2.0`](https://togithub.com/hashicorp/terraform-provider-null/blob/HEAD/CHANGELOG.md#​320-October-25-2022)\r\n\r\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-null/compare/v3.1.1...v3.2.0)\r\n\r\nNOTES:\r\n\r\n- Provider: Rewritten to use the new [`terraform-plugin-framework`](https://www.terraform.io/plugin/framework) ([#​150](https://togithub.com/hashicorp/terraform-provider-null/pull/150))\r\n\r\n### [`v3.1.1`](https://togithub.com/hashicorp/terraform-provider-null/blob/HEAD/CHANGELOG.md#​311-March-16-2022)\r\n\r\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-null/compare/v3.1.0...v3.1.1)\r\n\r\nNOTES:\r\n\r\n- Updated [terraform-plugin-docs](https://togithub.com/hashicorp/terraform-plugin-docs) to `v0.7.0`:\r\n this improves generated documentation, with attributes now correctly formatted as `code`\r\n and provided with anchors.\r\n- Functionally identical to the previous 3.1.0 release.\r\n\r\n### [`v3.1.0`](https://togithub.com/hashicorp/terraform-provider-null/blob/HEAD/CHANGELOG.md#​310-February-19-2021)\r\n\r\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-null/compare/v3.0.0...v3.1.0)\r\n\r\nBinary releases of this provider now include the darwin-arm64 platform. This version contains no further changes.\r\n\r\n### [`v3.0.0`](https://togithub.com/hashicorp/terraform-provider-null/blob/HEAD/CHANGELOG.md#​300-October-08-2020)\r\n\r\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-null/compare/v2.1.2...v3.0.0)\r\n\r\nBinary releases of this provider now include the linux-arm64 platform.\r\n\r\nBREAKING CHANGES:\r\n\r\n- Upgrade to version 2 of the Terraform Plugin SDK, which drops support for Terraform 0.11. This provider will continue to work as expected for users of Terraform 0.11, which will not download the new version. ([#​47](https://togithub.com/terraform-providers/terraform-provider-null/issues/47))\r\n\r\n</details>\r\n\r\n---\r\n\r\n### Configuration\r\n\r\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\r\n\r\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\r\n\r\n♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.\r\n\r\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\r\n\r\n---\r\n\r\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\r\n\r\n---\r\n\r\nThis PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\r\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xLjUiLCJ1cGRhdGVkSW5WZXIiOiIzNC4xMi4wIn0=-->\r\n\r\nBEGIN_COMMIT_OVERRIDE\r\nchore(deps): update terraform null to v3 #395\r\nEND_COMMIT_OVERRIDE\n\n---\n\nChoice A:\nexamples/basic_auto_mode/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_custom_mode/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_firewall_rule/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_secondary_ranges/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_shared_vpc/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_vpc_peering/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \">= 3.45, < 5.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/delete_default_gateway_routes/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/firewall_logging/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/network_service_tiers/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/packet_mirroring/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/routes/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/simple_project/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\n\n\n---\n\nChoice B:\nexamples/basic_auto_mode/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_custom_mode/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_firewall_rule/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_secondary_ranges/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_shared_vpc/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_vpc_peering/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \">= 3.45, < 5.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/delete_default_gateway_routes/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/firewall_logging/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/network_service_tiers/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n null }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/packet_mirroring/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/routes/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/simple_project/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\n\n\n---\n\nChoice C:\nexamples/basic_auto_mode/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_custom_mode/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_firewall_rule/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_secondary_ranges/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_shared_vpc/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_vpc_peering/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \">= 3.45, < 5.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/delete_default_gateway_routes/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/firewall_logging/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/network_service_tiers/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/packet_mirroring/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/routes/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/simple_project/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\n\n\n---\n\nChoice D:\nexamples/basic_auto_mode/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_custom_mode/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_firewall_rule/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_secondary_ranges/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_shared_vpc/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/basic_vpc_peering/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \">= 3.45, < 5.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/delete_default_gateway_routes/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/firewall_logging/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/network_service_tiers/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/packet_mirroring/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/routes/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/simple_project/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.0\"\n }\n }\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -22,7 +22,7 @@ terraform {\n version = \"~> 4.0\"\n }\n null = {\n- version = \"~> 2.1\"\n+ version = \"~> 3.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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\r\n\r\nThis PR contains the following updates:\r\n\r\n| Package | Type | Update | Change |\r\n|---|---|---|---|\r\n| [terraform-google-modules/network/google](https://registry.terraform.io/modules/terraform-google-modules/network/google) ([source](https://togithub.com/terraform-google-modules/terraform-google-network)) | module | major | `~> 3.3.0` -> `~> 5.2.0` |\r\n| [terraform-google-modules/network/google](https://registry.terraform.io/modules/terraform-google-modules/network/google) ([source](https://togithub.com/terraform-google-modules/terraform-google-network)) | module | major | `~> 4.0.1` -> `~> 5.2.0` |\r\n| [terraform-google-modules/network/google](https://registry.terraform.io/modules/terraform-google-modules/network/google) ([source](https://togithub.com/terraform-google-modules/terraform-google-network)) | module | major | `~> 3.2.1` -> `~> 5.2.0` |\r\n| [terraform-google-modules/network/google](https://registry.terraform.io/modules/terraform-google-modules/network/google) ([source](https://togithub.com/terraform-google-modules/terraform-google-network)) | module | major | `~> 3.0` -> `~> 5.0` |\r\n| [terraform-google-modules/project-factory/google](https://registry.terraform.io/modules/terraform-google-modules/project-factory/google) ([source](https://togithub.com/terraform-google-modules/terraform-google-project-factory)) | module | major | `~> 13.0` -> `~> 14.0` |\r\n\r\n---\r\n\r\n### Configuration\r\n\r\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\r\n\r\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\r\n\r\n♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.\r\n\r\n👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired.\r\n\r\n---\r\n\r\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.\r\n\r\n---\r\n\r\nThis PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\r\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4yLjMiLCJ1cGRhdGVkSW5WZXIiOiIzNC4yLjMifQ==-->\n\n---\n\nChoice A:\ncodelabs/simple/main.tf\n@@ -25,7 +25,7 @@ resource \"google_project_service\" \"compute\" {\n # Create the network\n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 3.0\"\n+ version = \"~> 5.0\"\n \n # Give the network a name and project\n project_id = google_project_service.compute.project\n---\nexamples/basic_vpc_peering/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_peering_create]\n module \"peering1\" {\n source = \"terraform-google-modules/network/google//modules/network-peering\"\n- version = \"~> 3.2.1\"\n+ version = \"~> 5.2\"\n local_network = var.local_network # Replace with self link to VPC network \"foobar\" in quotes\n peer_network = var.peer_network # Replace with self link to VPC network \"other\" in quotes\n }\n---\nexamples/private_service_connect/main.tf\n@@ -30,7 +30,7 @@ module \"private_service_connect\" {\n \n module \"simple_vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 4.0.1\"\n+ version = \"~> 5.2\"\n project_id = var.project_id\n network_name = \"my-custom-network\"\n mtu 1460\n---\nexamples/submodule_vpc_serverless_connector/main.tf\n@@ 1460\n---\nexamples/simple_project/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_custom_create]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 4.0.1\"\n+ version = \"~> 5.2\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-custom-mode-network\"\n mtu = 1460\n---\nexamples/submodule_vpc_serverless_connector/main.tf\n@@ -24,7 +24,7 @@ resource \"google_project_service\" \"vpcaccess-api\" {\n # [START vpc_serverless_connector]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 3.3.0\"\n+ version = \"~> 5.2\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-serverless-network\"\n mtu = 1460\n---\ntest/setup/main.tf\n@@ -16,7 +16,7 @@\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 13.0\"\n+ version = \"~> 14.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice B:\ncodelabs/simple/main.tf\n@@ -25,7 +25,7 @@ resource \"google_project_service\" \"compute\" {\n # Create the network\n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 3.0\"\n+ version = \"~> 5.0\"\n \n # Give the network a name and project\n project_id = google_project_service.compute.project\n---\nexamples/basic_vpc_peering/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_peering_create]\n module \"peering1\" {\n source = \"terraform-google-modules/network/google//modules/network-peering\"\n- version = \"~> 3.2.1\"\n+ version = \"~> 5.2\"\n local_network = var.local_network # Replace with self link to VPC network \"foobar\" in quotes\n peer_network = var.peer_network # Replace with self link to VPC network \"other\" in quotes\n }\n---\nexamples/private_service_connect/main.tf\n@@ -30,7 +30,7 @@ module \"private_service_connect\" {\n \n module \"simple_vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 4.0.1\"\n+ version = \"~> 5.2\"\n project_id = var.project_id\n network_name = \"my-custom-network\"\n mtu = 1460\n---\nexamples/simple_project/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_custom_create]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 4.0.1\"\n+ version = \"~> 5.2\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-custom-mode-network\"\n mtu = 1460\n---\nexamples/submodule_vpc_serverless_connector/main.tf\n@@ -24,7 +24,7 @@ resource \"google_project_service\" \"vpcaccess-api\" {\n # [START vpc_serverless_connector]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 3.3.0\"\n+ version = \"~> 5.2\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-serverless-network\"\n mtu = 1460\n---\ntest/setup/main.tf\n@@ -16,7 +16,7 @@\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 13.0\"\n+ version = \"~> 14.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice C:\ncodelabs/simple/main.tf\n@@ -25,7 +25,7 @@ resource \"google_project_service\" \"compute\" {\n # Create the network\n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 3.0\"\n+ version = \"~> 5.0\"\n \n # Give the network a name and project\n project_id = google_project_service.compute.project\n---\nexamples/basic_vpc_peering/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_peering_create]\n module \"peering1\" {\n source = \"terraform-google-modules/network/google//modules/network-peering\"\n- version = \"~> 3.2.1\"\n+ version = \"~> 5.2\"\n local_network = var.local_network # Replace with self link to VPC network \"foobar\" in quotes\n peer_network = var.peer_network # Replace with self link to VPC network \"other\" in quotes\n }\n---\nexamples/private_service_connect/main.tf\n@@ -30,7 +30,7 @@ module \"private_service_connect\" {\n \n module \"simple_vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 4.0.1\"\n+ version = \"~> 5.2\"\n project_id = var.project_id\n network_name = \"my-custom-network\"\n mtu = 1460\n---\nexamples/simple_project/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_custom_create]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 4.0.1\"\n+ version = \"~> 5.2\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-custom-mode-network\"\n mtu = 1460\n---\nexamples/submodule_vpc_serverless_connector/main.tf\n@@ -24,7 +24,7 @@ resource \"google_project_service\" \"vpcaccess-api\" {\n # [START vpc_serverless_connector]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 3.3.0\"\n+ version = \"~> 5.2\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-serverless-network\"\n mtu = 1460\n---\ntest/setup/main.tf\n@@ -16,7 +16,7 @@\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 13.0\"\n+ version = \"~> 14.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice D:\ncodelabs/simple/main.tf\n@@ -25,7 +25,7 @@ resource \"google_project_service\" \"compute\" {\n # Create the network\n module \"vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 3.0\"\n+ version = \"~> 5.0\"\n \n # Give the network a name and project\n project_id = google_project_service.compute.project\n---\nexamples/basic_vpc_peering/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_peering_create]\n module \"peering1\" {\n source = \"terraform-google-modules/network/google//modules/network-peering\"\n- version = \"~> 3.2.1\"\n+ version = \"~> 5.2\"\n local_network = var.local_network # Replace with self link to VPC network \"foobar\" in quotes\n peer_network = var.peer_network # Replace with self link to VPC network \"other\" in quotes\n }\n---\nexamples/private_service_connect/main.tf\n@@ -30,7 +30,7 @@ module \"private_service_connect\" {\n \n module \"simple_vpc\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 4.0.1\"\n+ version = \"~> 5.2\"\n project_id = var.project_id\n network_name = \"my-custom-network\"\n mtu = 1460\n---\nexamples/simple_project/main.tf\n@@ -23,7 +23,7 @@\n # [START vpc_custom_create]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 4.0.1\"\n+ version = \"~> 5.2\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-custom-mode-network\"\n mtu = 1460\n---\nexamples/submodule_vpc_serverless_connector/main.tf\n@@ -24,7 +24,7 @@ resource \"google_project_service\" \"vpcaccess-api\" {\n # [START vpc_serverless_connector]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 3.3.0\"\n+ version = \"~> 5.2\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-serverless-network\"\n mtu = 1460\n---\ntest/setup/main.tf\n@@ -16,7 +16,7 @@\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 13.0\"\n+ version = \"~> 14.0\"\n \n name = \"ci-network\"\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n* purpose and role fields added to google_compute_subnetwork in TPG 2.15.0\r\n\r\nMay fix #366 \n\n---\n\nChoice A:\nmodules/subnets/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"<5.0,>= 2.12\"\n+ version = \"<5.0,>= 2.15\"\n }\n }\n \n---\n\n\n---\n\nChoice B:\nmodules/subnets/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"<5.0,>= 2.12\"\n+ version = \"<5.0,>= 2.15\"\n }\n }\n \n---\n\n\n---\n\nChoice C:\nmodules/subnets/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"<5.0,>= 2.12\"\n+ version = \"<5.0,>= 2.15\"\n }\n }\n \n---\n\n\n---\n\nChoice D:\nmodules/subnets/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n \"<5.0,>= source = \"hashicorp/google\"\n- version = \"<5.0,>= 2.12\"\n+ version = \"<5.0,>= 2.15\"\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://togithub.com/hashicorp/terraform-provider-google)) | required_provider | minor | `~> 3.45.0` -> `~> 3.90.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>hashicorp/terraform-provider-google</summary>\n\n### [`v3.90.1`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.90.1)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.90.0...v3.90.1)\n\nDEPRECATIONS:\n\n- container: fixed an overly-broad deprecation on `master_auth`, constraining it to `master_auth.username` and `master_auth.password`\n\n### [`v3.90.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.90.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.89.0...v3.90.0)\n\nDEPRECATIONS:\n\n- container: deprecated `workload_identity_config.0.identity_namespace` and it will be removed in a future major release as it has been deprecated in the API. Use `workload_identity_config.0.workload_pool` instead. Switching your configuration from one value to the other will trigger a diff at plan time, and a spurious update. ([#​10327](https://togithub.com/hashicorp/terraform-provider-google/pull/10327))\n- container: deprecated the following `google_container_cluster` fields: `instance_group_urls` and `master_auth` ([#​10356](https://togithub.com/hashicorp/terraform-provider-google/pull/10356))\n\nIMPROVEMENTS:\n\n- container: added `node_config.0.guest_accelerator.0.gpu_partition_size` field to google_container_node_pool ([#​10339](https://togithub.com/hashicorp/terraform-provider-google/pull/10339))\n- container: added `workload_identity_config.0.workload_pool` to `google_container_cluster` ([#​10327](https://togithub.com/hashicorp/terraform-provider-google/pull/10327))\n- container_cluster: Updated `monitoring_config` to accept `WORKLOAD` ([#​10321](https://togithub.com/hashicorp/terraform-provider-google/pull/10321))\n- provider: Added links to nested types documentation for manually generated pages ([#​10333](https://togithub.com/hashicorp/terraform-provider-google/pull/10333))\n\nBUG FIXES:\n\n- cloudrun: fixed a permadiff on the field `template.spec.containers.ports.name` of the `google_cloud_run_service` resource ([#​10340](https://togithub.com/hashicorp/terraform-provider-google/pull/10340))\n- composer: removed `config.node_config.zone` requirement on `google_composer_environment` ([#​10353](https://togithub.com/hashicorp/terraform-provider-google/pull/10353))\n- compute: fixed permadiff for `failover_policy` on `google_compute_region_backend_service` ([#​10316](https://togithub.com/hashicorp/terraform-provider-google/pull/10316))\n- compute: fixed to make `description` updatable without recreation on `google_compute_instance_group_manager` ([#​10329](https://togithub.com/hashicorp/terraform-provider-google/pull/10329))\n- container: fixed a permadiff on `google_container_node_pool.workload_metadata_config.mode` ([#​10313](https://togithub.com/hashicorp/terraform-provider-google/pull/10313))\n- iam: fixed request batching bug where failed requests would show unnecessary backslash escaping to the user. ([#​10303](https://togithub.com/hashicorp/terraform-provider-google/pull/10303))\n- securitycenter: fixed bug where `google_scc_notification_config.streaming_config.filter` was not updating. ([#​10315](https://togithub.com/hashicorp/terraform-provider-google/pull/10315))\n\n### [`v3.89.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.89.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.88.0...v3.89.0)\n\nDEPRECATIONS:\n\n- compute: deprecated the `enable_display` field in `google_compute_instance_template` in the `google` (GA) provider. It will only be available in the `google-beta` provider in a future release, as the underlying feature is in beta. ([#​10281](https://togithub.com/hashicorp/terraform-provider-google/pull/10281))\n\nBUG FIXES:\n\n- compute: fixed bug where `google_compute_router_peer` could not set an advertised route priority of 0, causing permadiff. ([#​10292](https://togithub.com/hashicorp/terraform-provider-google/pull/10292))\n- container: fixed a crash on `monitoring_config` of `google_container_cluster` ([#​10290](https://togithub.com/hashicorp/terraform-provider-google/pull/10290))\n- iam: fixed request batching bug where failed requests would show unnecessary backslash escaping to the user. ([#​10303](https://togithub.com/hashicorp/terraform-provider-google/pull/10303))\n- storage: fixed a bug to better handle eventual consistency among `google_storage_bucket` resources. ([#​10287](https://togithub.com/hashicorp/terraform-provider-google/pull/10287))\n\n### [`v3.88.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.88.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.87.0...v3.88.0)\n\nNOTES:\n\n- reorganized documentation to group all Compute Engine and Monitoring (Stackdriver) resources together. ([#​10205](https://togithub.com/hashicorp/terraform-provider-google/pull/10205))\n\nDEPRECATIONS:\n\n- container: deprecated `workload_metadata_configuration.node_metadata` in favor of `workload_metadata_configuration.mode` in `google_container_cluster` ([#​10238](https://togithub.com/hashicorp/terraform-provider-google/pull/10238))\n- dataproc: deprecated the `google_dataproc_workflow_template.version` field, as it wasn't actually useful. The field is used during updates, but updates aren't currently possible with the resource. ([#​10183](https://togithub.com/hashicorp/terraform-provider-google/pull/10183))\n- runtimeconfig: deprecated the Runtime Configurator service in the `google` (GA) provider including `google_runtimeconfig_config`, `google_runtimeconfig_variable`, `google_runtimeconfig_config_iam_policy`, `google_runtimeconfig_config_iam_binding`, `google_runtimeconfig_config_iam_member`, `data.google_runtimeconfig_config`. They will only be available in the `google-beta` provider in a future release, as the underlying service is in beta. ([#​10232](https://togithub.com/hashicorp/terraform-provider-google/pull/10232))\n BREAKING CHANGES:\n- gke_hub: made the `config_membership` field in `google_gke_hub_feature` required, disallowing invalid configurations ([#​10199](https://togithub.com/hashicorp/terraform-provider-google/pull/10199))\n- gke_hub: made the `configmanagement`, `feature`, `location`, `membership` fields in `google_gke_hub_feature_membership` required, disallowing invalid configurations ([#​10199](https://togithub.com/hashicorp/terraform-provider-google/pull/10199))\n\nFEATURES:\n\n- **New Data Source:** `google_service_networking_peered_dns_domain` ([#​10229](https://togithub.com/hashicorp/terraform-provider-google/pull/10229))\n- **New Data Source:** `google_sourcerepo_repository` ([#​10203](https://togithub.com/hashicorp/terraform-provider-google/pull/10203))\n- **New Data Source:** `google_storage_bucket` ([#​10190](https://togithub.com/hashicorp/terraform-provider-google/pull/10190))\n- **New Resource:** `google_pubsub_lite_reservation` ([#​10263](https://togithub.com/hashicorp/terraform-provider-google/pull/10263))\n- **New Resource:** `google_service_networking_peered_dns_domain` ([#​10229](https://togithub.com/hashicorp/terraform-provider-google/pull/10229))\n\nIMPROVEMENTS:\n\n- composer: added support for composer v2 fields `workloads_config` and `cloud_composer_network_ipv4_cidr_block` to `composer_environment` ([10269](https://togithub.com/hashicorp/terraform-provider-google/pull/10269))\n- compute: added external IPv6 support on `google_compute_subnetwork` and `google_compute_instance.network_interfaces` ([#​10189](https://togithub.com/hashicorp/terraform-provider-google/pull/10189))\n- container: added support for `workload_metadata_configuration.mode` in `google_container_cluster` ([#​10238](https://togithub.com/hashicorp/terraform-provider-google/pull/10238))\n- eventarc: added support for `uid` output field, `cloud_function` destination to `google_eventarc_trigger` ([#​10199](https://togithub.com/hashicorp/terraform-provider-google/pull/10199))\n- gke_hub: added support for `gcp_service_account_email` when configuring Git sync in `google_gke_hub_feature_membership` ([#​10199](https://togithub.com/hashicorp/terraform-provider-google/pull/10199))\n- gke_hub: added support for `resource_state`, `state` outputs to `google_gke_hub_feature` ([#​10199](https://togithub.com/hashicorp/terraform-provider-google/pull/10199))\n- pubsub: Added support for references to `google_pubsub_lite_reservation` to `google_pubsub_lite_topic`. ([#​10263](https://togithub.com/hashicorp/terraform-provider-google/pull/10263))\n\nBUG FIXES:\n\n- monitoring: fixed typo in `google_monitoring_uptime_check_config` where `NOT_MATCHES_REGEX` could not be specified. ([#​10249](https://togithub.com/hashicorp/terraform-provider-google/pull/10249))\n\n### [`v3.87.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.87.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.86.0...v3.87.0)\n\n#### 3.87.0 (October 04, 2021)\n\nDEPRECATIONS:\n\n- dataproc: deprecated the `google_dataproc_workflow_template.version` field, as it wasn't actually useful. The field is used during updates, but updates aren't currently possible with the resource. ([#​10183](https://togithub.com/hashicorp/terraform-provider-google/pull/10183))\n\nFEATURES:\n\n- **New Resource:** `google_org_policy_policy` ([#​10111](https://togithub.com/hashicorp/terraform-provider-google/pull/10111))\n\nIMPROVEMENTS:\n\n- cloudbuild: added field `service_account` to `google_cloudbuild_trigger` ([#​10159](https://togithub.com/hashicorp/terraform-provider-google/pull/10159))\n- composer: added field `scheduler_count` to `google_composer_environment` ([#​10158](https://togithub.com/hashicorp/terraform-provider-google/pull/10158))\n- compute: Disabled recreation of GCE instances when updating `resource_policies` property ([#​10173](https://togithub.com/hashicorp/terraform-provider-google/pull/10173))\n- container: added support for `logging_config` and `monitoring_config` to `google_container_cluster` ([#​10125](https://togithub.com/hashicorp/terraform-provider-google/pull/10125))\n- kms: added support for `import_only` to `google_kms_crypto_key` ([#​10157](https://togithub.com/hashicorp/terraform-provider-google/pull/10157))\n- networkservices: boosted the default timeout for `google_network_services_edge_cache_origin` from 30m to 60m ([#​10182](https://togithub.com/hashicorp/terraform-provider-google/pull/10182))\n\nBUG FIXES:\n\n- container: fixed an issue where a node pool created with error (eg. GKE_STOCKOUT) would not be captured in state ([#​10137](https://togithub.com/hashicorp/terraform-provider-google/pull/10137))\n- filestore: Allowed updating `reserved_ip_range` on `google_filestore_instance` via recreation of the instance ([#​10146](https://togithub.com/hashicorp/terraform-provider-google/pull/10146))\n- serviceusage: enabled the service api to retry on failed operation calls in anticipation of transient errors that occur when first enabling the service. ([#​10171](https://togithub.com/hashicorp/terraform-provider-google/pull/10171))\n\n### [`v3.86.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.86.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.85.0...v3.86.0)\n\nIMPROVEMENTS:\n\n- healthcare: promoted `google_healthcare_hl7_v2_store.parseConfig.version` to GA ([#​10099](https://togithub.com/hashicorp/terraform-provider-google/pull/10099))\n\nBUG FIXES:\n\n- dns: fixed an issue in `google_dns_record_set` where `rrdatas` could not be updated ([#​10089](https://togithub.com/hashicorp/terraform-provider-google/pull/10089))\n- dns: fixed an issue in `google_dns_record_set` where creating the resource would result in an 409 error ([#​10089](https://togithub.com/hashicorp/terraform-provider-google/pull/10089))\n- platform: fixed a bug in wrongly writing to state when creation failed on `google_organization_policy` ([#​10082](https://togithub.com/hashicorp/terraform-provider-google/pull/10082))\n\n### [`v3.85.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.85.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.84.0...v3.85.0)\n\nIMPROVEMENTS:\n\n- bigtable: enabled support for `user_project_override` in `google_bigtable_instance` and `google_bigtable_table` ([#​10060](https://togithub.com/hashicorp/terraform-provider-google/pull/10060))\n- compute: added `iap` fields to `google_compute_region_backend_service` ([#​10038](https://togithub.com/hashicorp/terraform-provider-google/pull/10038))\n- compute: allowed passing an IP address to the `nextHopIlb` field of `google_compute_route` resource ([#​10048](https://togithub.com/hashicorp/terraform-provider-google/pull/10048))\n- iam: added `disabled` field to `google_service_account` resource ([#​10033](https://togithub.com/hashicorp/terraform-provider-google/pull/10033))\n- provider: added links to nested types documentation within a resource ([#​10063](https://togithub.com/hashicorp/terraform-provider-google/pull/10063))\n- storage: added field `path` to `google_storage_transfer_job` ([#​10047](https://togithub.com/hashicorp/terraform-provider-google/pull/10047))\n\nBUG FIXES:\n\n- appengine: fixed bug where `deployment.container.image` would update to an old version even if in `ignore_changes` ([#​10058](https://togithub.com/hashicorp/terraform-provider-google/pull/10058))\n- bigquery: fixed a bug where `destination_encryption_config.kms_key_name` stored the version rather than the key name. ([#​10068](https://togithub.com/hashicorp/terraform-provider-google/pull/10068))\n- redis: extended the default timeouts on `google_redis_instance` ([#​10037](https://togithub.com/hashicorp/terraform-provider-google/pull/10037))\n- serviceusage: fixed an issue in `google_project_service` where users could not reenable services that were disabled outside of Terraform. ([#​10045](https://togithub.com/hashicorp/terraform-provider-google/pull/10045))\n\n### [`v3.84.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.84.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.83.0...v3.84.0)\n\nFEATURES:\n\n- **New Data Source:** `google_secret_manager_secret` ([#​9983](https://togithub.com/hashicorp/terraform-provider-google/pull/9983))\n\nIMPROVEMENTS:\n\n- compute: added update support to `google_compute_service_attachment` ([#​9982](https://togithub.com/hashicorp/terraform-provider-google/pull/9982))\n\nBUG FIXES:\n\n- container: fixed a bug in failing to remove `maintenance_exclusion` on `google_container_cluster` ([#​10025](https://togithub.com/hashicorp/terraform-provider-google/pull/10025))\n- compute: fixed an issue in `google_compute_router_nat` where removing `log_config` resulted in a perma-diff ([#​9950](https://togithub.com/hashicorp/terraform-provider-google/pull/9950))\n- compute: fixed `advanced_machine_features` error messages in `google_compute_instance` ([#​10023](https://togithub.com/hashicorp/terraform-provider-google/pull/10023))\n- eventarc: fixed bug where resources deleted outside of Terraform would cause errors ([#​9997](https://togithub.com/hashicorp/terraform-provider-google/pull/9997))\n- functions: fixed an error message on `google_cloudfunctions_function` ([#​10011](https://togithub.com/hashicorp/terraform-provider-google/pull/10011))\n- logging: fixed the data type for `bucket_options.linear_buckets.width` on `google_logging_metric` ([#​9985](https://togithub.com/hashicorp/terraform-provider-google/pull/9985))\n- osconfig: fixed import on `google_os_config_guest_policies` ([#​10019](https://togithub.com/hashicorp/terraform-provider-google/pull/10019))\n- storage: fixed an undetected change on `days_since_noncurrent_time` of `google_storage_bucket` ([#​10024](https://togithub.com/hashicorp/terraform-provider-google/pull/10024))\n\n### [`v3.83.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.83.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.82.0...v3.83.0)\n\nFEATURES:\n\n- **New Resource:** `google_privateca_certificate_template` ([#​9905](https://togithub.com/hashicorp/terraform-provider-google/pull/9905))\n\nIMPROVEMENTS:\n\n- privateca: added `certificate_template` to `google_privateca_certificate`. ([#​9915](https://togithub.com/hashicorp/terraform-provider-google/pull/9915))\n- compute: allowed setting `ip_address` field of `google_compute_router_peer` ([#​9913](https://togithub.com/hashicorp/terraform-provider-google/pull/9913))\n- compute: promoted `google_compute_service_attachment` to ga ([#​9914](https://togithub.com/hashicorp/terraform-provider-google/pull/9914))\n- compute: promoted `role` and `purpose` fields in `google_compute_subnetwork` to ga ([#​9914](https://togithub.com/hashicorp/terraform-provider-google/pull/9914))\n- kms: added support for `destroy_scheduled_duration` to `google_kms_crypto_key` ([#​9911](https://togithub.com/hashicorp/terraform-provider-google/pull/9911))\n\nBUG FIXES:\n\n- endpoints: fixed a timezone discrepancy in `config_id` on `google_endpoints_service` ([#​9912](https://togithub.com/hashicorp/terraform-provider-google/pull/9912))\n- cloudbuild: marked `google_cloudbuild_trigger` as requiring one of branch_name/tag_name/commit_sha within build.source.repo_source ([#​9952](https://togithub.com/hashicorp/terraform-provider-google/pull/9952))\n- compute: fixed a crash on `enable` field of `google_compute_router_peer` ([#​9940](https://togithub.com/hashicorp/terraform-provider-google/pull/9940))\n- compute: fixed a permanent diff for `next_hop_instance_zone` on `google_compute_route` when `next_hop_instance` was set to a self link ([#​9931](https://togithub.com/hashicorp/terraform-provider-google/pull/9931))\n- compute: fixed an issue in `google_compute_router_nat` where removing `log_config` resulted in a perma-diff ([#​9950](https://togithub.com/hashicorp/terraform-provider-google/pull/9950))\n- privateca: fixed a permadiff bug for `publishing_options` on `google_privateca_ca_pool` when both attributes set false ([#​9926](https://togithub.com/hashicorp/terraform-provider-google/pull/9926))\n- spanner: fixed instance updates to processing units ([#​9933](https://togithub.com/hashicorp/terraform-provider-google/pull/9933))\n- storage: added support for timeouts on `google_storage_bucket_object` ([#​9937](https://togithub.com/hashicorp/terraform-provider-google/pull/9937))\n\n### [`v3.82.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.82.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.81.0...v3.82.0)\n\nFEATURES:\n\n- **New Resource:** `google_privateca_certificate_template` ([#​9905](https://togithub.com/hashicorp/terraform-provider-google/pull/9905))\n- **New Resource:** `google_compute_firewall_policy` ([#​9887](https://togithub.com/hashicorp/terraform-provider-google/pull/9887))\n- **New Resource:** `google_compute_firewall_policy_association` ([#​9887](https://togithub.com/hashicorp/terraform-provider-google/pull/9887))\n- **New Resource:** `google_compute_firewall_policy_rule` ([#​9887](https://togithub.com/hashicorp/terraform-provider-google/pull/9887))\n\nIMPROVEMENTS:\n\n- sql: added field `collation` to `google_sql_database_instance` ([#​9888](https://togithub.com/hashicorp/terraform-provider-google/pull/9888))\n\nBUG FIXES:\n\n- apigateway: fixed import functionality for all `apigateway` resources ([#​9871](https://togithub.com/hashicorp/terraform-provider-google/pull/9871))\n- dns: fixed not-exists error message on data source `google_dns_managed_zone` ([#​9898](https://togithub.com/hashicorp/terraform-provider-google/pull/9898))\n- healthcare: fixed bug where changes to `google_healthcare_hl7_v2_store.parser_config` subfields would error with \"...parser_config.version field is immutable...\" ([#​9900](https://togithub.com/hashicorp/terraform-provider-google/pull/9900))\n- os_config: fixed imports for `google_os_config_guest_policies` ([#​9872](https://togithub.com/hashicorp/terraform-provider-google/pull/9872))\n- pubsub: added polling to `google_pubsub_schema` to deal with eventually consistent deletes ([#​9863](https://togithub.com/hashicorp/terraform-provider-google/pull/9863))\n- secretmanager: fixed an issue where `replication` fields would not update in `google_secret_manager_secret` ([#​9894](https://togithub.com/hashicorp/terraform-provider-google/pull/9894))\n- service_usage: fixed imports on `google_service_usage_consumer_quota_override` ([#​9876](https://togithub.com/hashicorp/terraform-provider-google/pull/9876))\n- sql: fixed a permadiff bug for `type` when BUILT_IN on `google_sql_user` ([#​9864](https://togithub.com/hashicorp/terraform-provider-google/pull/9864))\n- sql: fixed bug in `google_sql_user` with CLOUD_IAM_USERs on POSTGRES. ([#​9859](https://togithub.com/hashicorp/terraform-provider-google/pull/9859))\n\n### [`v3.81.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.81.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.80.0...v3.81.0)\n\nIMPROVEMENTS:\n\n- compute: Added `enable` attribute to `google_compute_router_peer` ([#​9776](https://togithub.com/hashicorp/terraform-provider-google/pull/9776))\n- compute: added support for `L3_DEFAULT` as `ip_protocol` for `google_compute_forwarding_rule` and `UNSPECIFIED` as `protocol` for `google_compute_region_backend_service` to support network load balancers that forward all protocols and ports. ([#​9799](https://togithub.com/hashicorp/terraform-provider-google/pull/9799))\n- compute: added support for `security_settings` to `google_compute_backend_service` ([#​9797](https://togithub.com/hashicorp/terraform-provider-google/pull/9797))\n- essentialcontacts: promoted `google_essential_contacts_contact` to GA ([#​9822](https://togithub.com/hashicorp/terraform-provider-google/pull/9822))\n- gkehub: added `google_gke_hub_membership` support for both `//container.googleapis.com/${google_container_cluster.my-cluster.id}` and `google_container_cluster.my-cluster.id` in `endpoint.0.gke_cluster.0.resource_link` ([#​9765](https://togithub.com/hashicorp/terraform-provider-google/pull/9765))\n- provider: Added provider support for `request_reason` ([#​9794](https://togithub.com/hashicorp/terraform-provider-google/pull/9794))\n- provider: added support for `billing_project` across all resources. If `user_project_override` is set to `true` and a `billing_project` is set, the `X-Goog-User-Project` header will be sent for all resources. ([#​9852](https://togithub.com/hashicorp/terraform-provider-google/pull/9852))\n\nBUG FIXES:\n\n- assuredworkloads: fixed resource deletion so `google_assured_workloads_workload` can delete what it creates ([#​9835](https://togithub.com/hashicorp/terraform-provider-google/pull/9835))\n- bigquery: fixed the permadiff bug on `location` of the `google_bigquery_dataset` ([#​9810](https://togithub.com/hashicorp/terraform-provider-google/pull/9810))\n- composer: fixed environment version regexp to explicitly require . (dot) instead of any character after 'preview' (example: composer-2.0.0-preview.0-airflow-2.1.1) ([#​9804](https://togithub.com/hashicorp/terraform-provider-google/pull/9804))\n- compute: changed `wait_for_instances` in `google_compute_instance_group_manager` and `google_compute_region_instance_group_manager` to no longer block plan / refresh, waiting on managed instance statuses during apply instead ([#​9832](https://togithub.com/hashicorp/terraform-provider-google/pull/9832))\n- compute: fixed a bug where `negative_caching_policy` cannot be set always revalidate on `google_compute_backend_service` ([#​9821](https://togithub.com/hashicorp/terraform-provider-google/pull/9821))\n- compute: fixed instances where compute resource calls would have their urls appended with a redundant `/projects` after the host ([#​9834](https://togithub.com/hashicorp/terraform-provider-google/pull/9834))\n- firestore: removed diff for server generated field `__name__` on `google_firestore_index` ([#​9820](https://togithub.com/hashicorp/terraform-provider-google/pull/9820))\n- privateca: fixed the creation of subordinate `google_privateca_certificate_authority` with `max_issuer_path_length = 0`. ([#​9856](https://togithub.com/hashicorp/terraform-provider-google/pull/9856))\n- privateca: Fixed null for `ignore_active_certificates_on_deletion` on the imported `google_privateca_certificate_authority` ([#​9781](https://togithub.com/hashicorp/terraform-provider-google/pull/9781))\n\n### [`v3.80.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.80.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.79.0...v3.80.0)\n\nFEATURES:\n\n- **New Resource:** `google_dialogflow_cx_environment` ([#​9738](https://togithub.com/hashicorp/terraform-provider-google/pull/9738))\n\nIMPROVEMENTS:\n\n- gkehub: added support for both `//container.googleapis.com/${google_container_cluster.my-cluster.id}` and `google_container_cluster.my-cluster.id` references in `google_gke_hub_membership.endpoint.0.gke_cluster.0.resource_link` ([#​9765](https://togithub.com/hashicorp/terraform-provider-google/pull/9765))\n- kms: added `name` field to `google_kms_crypto_key_version` datasource ([#​9762](https://togithub.com/hashicorp/terraform-provider-google/pull/9762))\n\nBUG FIXES:\n\n- apigee: fixed update behavior on `google_apigee_envgroup` ([#​9740](https://togithub.com/hashicorp/terraform-provider-google/pull/9740))\n- privateca: fixed a failure to create `google_privateca_certificate_authority` of type `SUBORDINATE` due to an invalid attempt to activate it on creation. ([#​9761](https://togithub.com/hashicorp/terraform-provider-google/pull/9761))\n\n### [`v3.79.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.79.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.78.0...v3.79.0)\n\nNOTES:\n\n- spanner: The `num_nodes` field on `google_spanner_instance` will have its default removed in a future major release, and either `num_nodes` or `processing_units` will be required. ([#​9716](https://togithub.com/hashicorp/terraform-provider-google/pull/9716))\n\nFEATURES:\n\n- **New Resource:** `google_dialogflow_cx_entity_type` ([#​9717](https://togithub.com/hashicorp/terraform-provider-google/pull/9717))\n- **New Resource:** `google_dialogflow_cx_page` ([#​9683](https://togithub.com/hashicorp/terraform-provider-google/pull/9683))\n\nIMPROVEMENTS:\n\n- spanner: added `processing_units` to `google_spanner_instance` ([#​9716](https://togithub.com/hashicorp/terraform-provider-google/pull/9716))\n- storage: added support for `customer_encryption` on `resource_storage_bucket_object` ([#​9704](https://togithub.com/hashicorp/terraform-provider-google/pull/9704))\n\n### [`v3.78.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.78.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.77.0...v3.78.0)\n\nFEATURES:\n\n- **New Resource:** `google_gke_hub_membership` ([#​9616](https://togithub.com/hashicorp/terraform-provider-google/pull/9616))\n\nIMPROVEMENTS:\n\n- servicenetworking: added support for `user_project_override` and ` billing_project ` to `google_service_networking_connection` ([#​9668](https://togithub.com/hashicorp/terraform-provider-google/pull/9668))\n\nBUG FIXES:\n\n- storagetransfer: Fixed a crash on `azure_blob_storage_data_source` for `google_storage_transfer_job` ([#​9644](https://togithub.com/hashicorp/terraform-provider-google/pull/9644))\n- sql: fixed bug that wouldn't insert the `google_sql_user` in state for iam users. ([#​9625](https://togithub.com/hashicorp/terraform-provider-google/pull/9625))\n- storage: fixed a crash when `azure_credentials` was defined in `google_storage_transfer_job` ([#​9671](https://togithub.com/hashicorp/terraform-provider-google/pull/9671))\n\n### [`v3.77.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.77.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.76.0...v3.77.0)\n\n#### 3.77.0 (July 26, 2021)\n\nFEATURES:\n\n- **New Resource:** `google_scc_notification_config` ([#​9578](https://togithub.com/hashicorp/terraform-provider-google/pull/9578))\n\nIMPROVEMENTS:\n\n- compute: fixed a permadiff bug in `log_config` field of `google_compute_region_backend_service` ([#​9568](https://togithub.com/hashicorp/terraform-provider-google/pull/9568))\n- dlp: added `crypto_replace_ffx_fpe_config` and `crypto_replace_ffx_fpe_config` as primitive transformation types to `google_data_loss_prevention_deidentify_template` ([#​9572](https://togithub.com/hashicorp/terraform-provider-google/pull/9572))\n\nBUG FIXES:\n\n- bigquerydatatransfer: fixed a bug where `destination_dataset_id` was required, it is now optional. ([#​9605](https://togithub.com/hashicorp/terraform-provider-google/pull/9605))\n- billing: Fixed ordering of `budget_filter. projects` on `google_billing_budget` ([#​9598](https://togithub.com/hashicorp/terraform-provider-google/pull/9598))\n- compute: removed default value of `0.8` from `google_backend_service.backend.max_utilization` and it will now default from API. All `max_connections_xxx` and `max_rate_xxx` will also default from API as these are all conditional on balancing mode. ([#​9587](https://togithub.com/hashicorp/terraform-provider-google/pull/9587))\n- sql: fixed bug where the provider would retry on an error if the database instance name couldn't be reused. ([#​9591](https://togithub.com/hashicorp/terraform-provider-google/pull/9591))\n\n### [`v3.76.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.76.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.75.0...v3.76.0)\n\nFEATURES:\n\n- **New Resource:** `google_dialogflow_cx_flow` ([#​9551](https://togithub.com/hashicorp/terraform-provider-google/pull/9551))\n- **New Resource:** `google_dialogflow_cx_intent` ([#​9537](https://togithub.com/hashicorp/terraform-provider-google/pull/9537))\n- **New Resource:** `google_dialogflow_cx_version` ([#​9554](https://togithub.com/hashicorp/terraform-provider-google/pull/9554))\n- **New Resource:** `google_network_services_edge_cache_keyset` ([#​9540](https://togithub.com/hashicorp/terraform-provider-google/pull/9540))\n- **New Resource:** `google_network_services_edge_cache_origin` ([#​9540](https://togithub.com/hashicorp/terraform-provider-google/pull/9540))\n- **New Resource:** `google_network_services_edge_cache_service` ([#​9540](https://togithub.com/hashicorp/terraform-provider-google/pull/9540))\n\nIMPROVEMENTS:\n\n- apigee: Added SLASH\\_22 support for `peering_cidr_range` on `google_apigee_instance` ([#​9558](https://togithub.com/hashicorp/terraform-provider-google/pull/9558))\n- cloudbuild: Added `pubsub_config` and `webhook_config` parameter to `google_cloudbuild_trigger`. ([#​9541](https://togithub.com/hashicorp/terraform-provider-google/pull/9541))\n\nBUG FIXES:\n\n- pubsub: fixed pubsublite update issues ([#​9544](https://togithub.com/hashicorp/terraform-provider-google/pull/9544))\n\n### [`v3.75.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.75.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.74.0...v3.75.0)\n\nFEATURES:\n\n- **New Resource:** google_privateca_ca_pool ([#​9480](https://togithub.com/hashicorp/terraform-provider-google/pull/9480))\n- **New Resource:** google_privateca_certificate ([#​9480](https://togithub.com/hashicorp/terraform-provider-google/pull/9480))\n- **New Resource:** google_privateca_certificate_authority ([#​9480](https://togithub.com/hashicorp/terraform-provider-google/pull/9480))\n\nIMPROVEMENTS:\n\n- bigquery: added `kms_key_version` as an output on `bigquery_table.encryption_configuration` and the `destination_encryption_configuration` blocks of `bigquery_job.query`, `bigquery_job.load`, and `bigquery_copy`. ([#​9500](https://togithub.com/hashicorp/terraform-provider-google/pull/9500))\n- compute: added `advanced_machine_features` to `google_compute_instance` ([#​9470](https://togithub.com/hashicorp/terraform-provider-google/pull/9470))\n- compute: promoted all `cdn_policy` sub fields in `google_compute_backend_service`, `google_compute_region_backend_service` and `google_compute_backend_bucket` to GA ([#​9432](https://togithub.com/hashicorp/terraform-provider-google/pull/9432))\n- dlp: Added `replace_with_info_type_config` to `dlp_deidentify_template`. ([#​9446](https://togithub.com/hashicorp/terraform-provider-google/pull/9446))\n- storage: added `temporary_hold` and `event_based_hold` attributes to `google_storage_bucket_object` ([#​9487](https://togithub.com/hashicorp/terraform-provider-google/pull/9487))\n\nBUG FIXES:\n\n- bigquery: Fixed permadiff due to lowercase mode/type in `google_bigquery_table.schema` ([#​9499](https://togithub.com/hashicorp/terraform-provider-google/pull/9499))\n- billing: made `all_updates_rule.*` fields updatable on `google_billing_budget` ([#​9473](https://togithub.com/hashicorp/terraform-provider-google/pull/9473))\n- billing: made `amount.specified_amount.units` updatable on `google_billing_budget` ([#​9465](https://togithub.com/hashicorp/terraform-provider-google/pull/9465))\n- compute: fixed perma-diff in `google_compute_instance` ([#​9460](https://togithub.com/hashicorp/terraform-provider-google/pull/9460))\n- storage: fixed handling of object paths that contain slashes for `google_storage_object_access_control` ([#​9502](https://togithub.com/hashicorp/terraform-provider-google/pull/9502))\n\n### [`v3.74.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.74.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.73.0...v3.74.0)\n\nFEATURES:\n\n- **New Resource:** `google_app_engine_service_network_settings` ([#​9414](https://togithub.com/hashicorp/terraform-provider-google/pull/9414))\n- **New Resource:** `google_vertex_ai_dataset` ([#​9411](https://togithub.com/hashicorp/terraform-provider-google/pull/9411))\n- **New Resource:** `google_cloudbuild_worker_pool` ([#​9417](https://togithub.com/hashicorp/terraform-provider-google/pull/9417))\n\nIMPROVEMENTS:\n\n- bigtable: added `cluster.kms_key_name` field to `google_bigtable_instance` ([#​9393](https://togithub.com/hashicorp/terraform-provider-google/pull/9393))\n- compute: promoted all `cdn_policy` sub fields in `google_compute_backend_service`, `google_compute_region_backend_service` and `google_compute_backend_bucket` to GA ([#​9432](https://togithub.com/hashicorp/terraform-provider-google/pull/9432))\n- secretmanager: added `ttl`, `expire_time`, `topics` and `rotation` fields to `google_secret_manager_secret` ([#​9398](https://togithub.com/hashicorp/terraform-provider-google/pull/9398))\n\nBUG FIXES:\n\n- container: allowed setting `node_config.service_account` at the same time as `enable_autopilot = true` for `google_container_cluster` ([#​9399](https://togithub.com/hashicorp/terraform-provider-google/pull/9399))\n- container: fixed issue where creating a node pool with a name that already exists would import that resource. `google_container_node_pool` ([#​9424](https://togithub.com/hashicorp/terraform-provider-google/pull/9424))\n- dataproc: fixed crash when creating `google_dataproc_workflow_template` with `secondary_worker_config` empty except for `num_instances = 0` ([#​9381](https://togithub.com/hashicorp/terraform-provider-google/pull/9381))\n- filestore: fixed an issue in `google_filestore_instance` where creating two instances simultaneously resulted in an error. ([#​9396](https://togithub.com/hashicorp/terraform-provider-google/pull/9396))\n- sql: added support for `binary_logging` on replica instances for `googe_sql_database_instance` ([#​9428](https://togithub.com/hashicorp/terraform-provider-google/pull/9428))\n\n### [`v3.73.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.73.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.72.0...v3.73.0)\n\nFEATURES:\n\n- **New Resource:** `google_dialogflow_cx_agent` ([#​9338](https://togithub.com/hashicorp/terraform-provider-google/pull/9338))\n\nIMPROVEMENTS:\n\n- provider: added support for [mtls authentication](https://google.aip.dev/auth/4114) ([#​9382](https://togithub.com/hashicorp/terraform-provider-google/pull/9382))\n- compute: added `advanced_machine_features` fields to `google_compute_instance_template` ([#​9363](https://togithub.com/hashicorp/terraform-provider-google/pull/9363))\n- compute: promoted `custom_response_headers` to GA for `google_compute_backend_service` and `google_compute_backend_bucket` ([#​9374](https://togithub.com/hashicorp/terraform-provider-google/pull/9374))\n- redis: allowed `redis_version` to be upgraded on `google_redis_instance` ([#​9378](https://togithub.com/hashicorp/terraform-provider-google/pull/9378))\n- redis: promoted fields `transit_encryption_mode` and `server_ca_certs` to GA on `google_redis_instance` ([#​9378](https://togithub.com/hashicorp/terraform-provider-google/pull/9378))\n\nBUG FIXES:\n\n- apigee: added SLASH\\_23 support for `peering_cidr_range` on `google_apigee_instance` ([#​9343](https://togithub.com/hashicorp/terraform-provider-google/pull/9343))\n- cloudrun: fixed a bug where plan would should a diff on `google_cloud_run_service` if the order of the `template.spec.containers.env` list was re-ordered outside of terraform. ([#​9340](https://togithub.com/hashicorp/terraform-provider-google/pull/9340))\n- container: added `user_project_override` support to the ContainerOperationWaiter used by `google_container_cluster` ([#​9379](https://togithub.com/hashicorp/terraform-provider-google/pull/9379))\n\n### [`v3.72.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.72.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.71.0...v3.72.0)\n\nIMPROVEMENTS:\n\n- compute: added support for IPsec-encrypted Interconnect in the form of new fields on `google_compute_router`, `google_compute_ha_vpn_gateway`, `google_compute_interconnect_attachment` and `google_compute_address`([#​9288](https://togithub.com/hashicorp/terraform-provider-google/pull/9288))\n- container: Allowed specifying a cluster id field for `google_container_node_pool.cluster` to ensure that a node pool is recreated if the associated cluster is recreated. ([#​9309](https://togithub.com/hashicorp/terraform-provider-google/pull/9309))\n- storagetransfer: added support for `azure_blob_storage_data_source` to `google_storage_transfer_job` ([#​9311](https://togithub.com/hashicorp/terraform-provider-google/pull/9311))\n\nBUG FIXES:\n\n- bigquery: Fixed `google_bigquery_table.schema` handling of policyTags ([#​9302](https://togithub.com/hashicorp/terraform-provider-google/pull/9302))\n- bigtable: fixed bug that would error if creating multiple bigtable gc policies at the same time ([#​9305](https://togithub.com/hashicorp/terraform-provider-google/pull/9305))\n- compute: fixed bug where `encryption` showed a perma-diff on resources created prior to the feature being released. ([#​9303](https://togithub.com/hashicorp/terraform-provider-google/pull/9303))\n\n### [`v3.71.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.71.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.70.0...v3.71.0)\n\nFEATURES:\n\n- **New Resource:** `google_dialogflow_fulfillment` ([#​9253](https://togithub.com/hashicorp/terraform-provider-google/pull/9253))\n\nIMPROVEMENTS:\n\n- compute: added `reservation_affinity` to `google_compute_instance` and `google_compute_instance_template` ([#​9256](https://togithub.com/hashicorp/terraform-provider-google/pull/9256))\n- compute: added support for `wait_for_instances_status` on `google_compute_instance_group_manager` and `google_compute_region_instance_group_manager` ([#​9231](https://togithub.com/hashicorp/terraform-provider-google/pull/9231))\n- compute: added support for output-only `status` field on `google_compute_instance_group_manager` and `google_compute_region_instance_group_manager` ([#​9231](https://togithub.com/hashicorp/terraform-provider-google/pull/9231))\n- compute: promoted `log_config` field of `google_compute_health_check` and `google_compute_region_health_check` to GA ([#​9274](https://togithub.com/hashicorp/terraform-provider-google/pull/9274))\n- compute: set the default value for log_config.enable on `google_compute_region_health_check` to avoid permanent diff on plan/apply. ([#​9274](https://togithub.com/hashicorp/terraform-provider-google/pull/9274))\n\nBUG FIXES:\n\n- composer: fixed a check that did not allow for preview versions in `google_composer_environment` ([#​9255](https://togithub.com/hashicorp/terraform-provider-google/pull/9255))\n- storage: fixed error when `matches_storage_class` is set empty on `google_storage_bucket` ([#​9221](https://togithub.com/hashicorp/terraform-provider-google/pull/9221))\n- vpcaccess: fixed permadiff when `max_throughput` is not set on `google_vpc_access_connector` ([#​9282](https://togithub.com/hashicorp/terraform-provider-google/pull/9282))\n\n### [`v3.70.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.70.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.69.0...v3.70.0)\n\nIMPROVEMENTS:\n\n- compute: added `provisioned_iops` to `google_compute_disk` ([#​9193](https://togithub.com/hashicorp/terraform-provider-google/pull/9193))\n- compute: promoted `distribution_policy_target_shape` field in `google_compute_region_instance_group_manager` to GA. ([#​9186](https://togithub.com/hashicorp/terraform-provider-google/pull/9186))\n- sql: added field `disk_autoresize_limit` to `sql_database_instance` ([#​9203](https://togithub.com/hashicorp/terraform-provider-google/pull/9203))\n\nBUG FIXES:\n\n- cloudrun: fixed a bug where resources would return successfully due to responses based on a previous version of the resource ([#​9213](https://togithub.com/hashicorp/terraform-provider-google/pull/9213))\n- storage: fixed error when `matches_storage_class` is set empty on `google_storage_bucket` ([#​9221](https://togithub.com/hashicorp/terraform-provider-google/pull/9221))\n\n### [`v3.69.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.69.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.68.0...v3.69.0)\n\nIMPROVEMENTS:\n\n- compute: added \"description\" field to \"google_compute_resource_policy\" resource ([#​9176](https://togithub.com/hashicorp/terraform-provider-google/pull/9176))\n- compute: added \"instance_schedule_policy\" field to \"google_compute_resource_policy\" resource ([#​9176](https://togithub.com/hashicorp/terraform-provider-google/pull/9176))\n- compute: promoted field `autoscaling_policy.scaling_schedules` on `google_compute_autoscaler` and `google_compute_region_autoscaler` to ga ([#​9165](https://togithub.com/hashicorp/terraform-provider-google/pull/9165))\n- compute: promoted `autoscaling_policy.cpu_utilization.predictive_method` on `google_compute_autoscaler` and `google_compute_region_autoscaler` to ga. ([#​9156](https://togithub.com/hashicorp/terraform-provider-google/pull/9156))\n\nBUG FIXES:\n\n- cloudidentity: fixed recreation on the `initial_group_config` of `google_cloud_identity_group` ([#​9143](https://togithub.com/hashicorp/terraform-provider-google/pull/9143))\n- compute: added mutex in `google_compute_metadata_item` to reduce retries + quota errors ([#​9168](https://togithub.com/hashicorp/terraform-provider-google/pull/9168))\n- container: fixed bug where `enable_shielded_nodes` could not be false on resource `google_container_cluster` ([#​9131](https://togithub.com/hashicorp/terraform-provider-google/pull/9131))\n\n### [`v3.68.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.68.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.67.0...v3.68.0)\n\nFEATURES:\n\n- **New Resource:** `google_pubsub_schema` ([#​9116](https://togithub.com/hashicorp/terraform-provider-google/pull/9116))\n\nIMPROVEMENTS:\n\n- compute: added `initial_size` in resource `google_compute_node_group` to account for scenarios where size may change under the hood ([#​9078](https://togithub.com/hashicorp/terraform-provider-google/pull/9078))\n- compute: added support for setting `kms_key_name` on `google_compute_machine_image` ([#​9107](https://togithub.com/hashicorp/terraform-provider-google/pull/9107))\n- dataflow: enabled updates for `google_dataflow_flex_template_job` ([#​9123](https://togithub.com/hashicorp/terraform-provider-google/pull/9123))\n\nBUG FIXES:\n\n- compute: fixed bug where, when an organization security policy association was removed outside of terraform, the next plan/apply would fail. ([#​9095](https://togithub.com/hashicorp/terraform-provider-google/pull/9095))\n- container: added validation to check that both `node_version` and `remove_default_node_pool` cannot be set on `google_container_cluster` ([#​9100](https://togithub.com/hashicorp/terraform-provider-google/pull/9100))\n- dns: suppressed spurious diffs due to case changes in DS records ([#​9099](https://togithub.com/hashicorp/terraform-provider-google/pull/9099))\n\n### [`v3.67.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.67.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.66.1...v3.67.0)\n\nFEATURES:\n\n- **New Resource:** google_memcache_instance ([#​8982](https://togithub.com/hashicorp/terraform-provider-google/pull/8982))\n\nNOTES:\n\n- all: changed default HTTP request timeout from 30 seconds to 120 seconds ([#​8966](https://togithub.com/hashicorp/terraform-provider-google/pull/8966))\n DEPRECATIONS:\n- compute: deprecated `distribution_policy_target_shape` in `google_compute_region_instance_group_manager` Use the `google-beta` provider to continue using this field ([#​8970](https://togithub.com/hashicorp/terraform-provider-google/pull/8970))\n- compute: deprecated `min_ready_sec` in `google_compute_region_instance_group_manager` & `google_compute_instance_group_manager` Use the `google-beta` provider to continue using this field ([#​8970](https://togithub.com/hashicorp/terraform-provider-google/pull/8970))\n- container: deprecated `pod_security_policy_config` field on resource `google_container_cluster`. Use the `google-beta` provider to continue using this field ([#​8970](https://togithub.com/hashicorp/terraform-provider-google/pull/8970))\n\nBREAKING CHANGES:\n\n- bigquery: updating `dataset_id` or `project_id` in `google_bigquery_dataset` will now recreate the resource ([#​8973](https://togithub.com/hashicorp/terraform-provider-google/pull/8973))\n\nIMPROVEMENTS:\n\n- accesscontextmanager: added support for `require_verified_chrome_os` in basic access levels. ([#​9071](https://togithub.com/hashicorp/terraform-provider-google/pull/9071))\n- billingbudget: added support for import of `google_billing_budget` ([#​8990](https://togithub.com/hashicorp/terraform-provider-google/pull/8990))\n- cloud_identity: added support for `initial_group_config` to the google_cloud_identity_group resource ([#​9035](https://togithub.com/hashicorp/terraform-provider-google/pull/9035))\n- cloudrun: added support to bind secrets from Secret Manager to environment variables or files to `google_cloud_run_service` ([#​9073](https://togithub.com/hashicorp/terraform-provider-google/pull/9073))\n- compute: added `initial_size` to account for scenarios where size may change under the hood in resource `google_compute_node_group` ([#​9078](https://togithub.com/hashicorp/terraform-provider-google/pull/9078))\n- healthcare: added support for `stream_configs` in `google_healthcare_dicom_store` ([#​8986](https://togithub.com/hashicorp/terraform-provider-google/pull/8986))\n- secretmanager: added support for setting a CMEK on `google_secret_manager_secret` ([#​9046](https://togithub.com/hashicorp/terraform-provider-google/pull/9046))\n- spanner: added `force_destroy` to `google_spanner_instance` to delete instances that have backups enabled. ([#​9076](https://togithub.com/hashicorp/terraform-provider-google/pull/9076))\n- spanner: added support for setting a CMEK on `google_spanner_database` ([#​8966](https://togithub.com/hashicorp/terraform-provider-google/pull/8966))\n- workflows: marked `source_contents` and `service_account` as updatable on `google_workflows_workflow` ([#​9018](https://togithub.com/hashicorp/terraform-provider-google/pull/9018))\n\nBUG FIXES:\n\n- bigquery: fixed `dataset_id` to force new resource if name is changed. ([#​8973](https://togithub.com/hashicorp/terraform-provider-google/pull/8973))\n- cloudrun: fixed permadiff on `google_cloud_run_domain_mapping.metadata.labels` ([#​8971](https://togithub.com/hashicorp/terraform-provider-google/pull/8971))\n- composer: changed `google_composer_environment.master_ipv4_cidr_block` to draw default from the API ([#​9017](https://togithub.com/hashicorp/terraform-provider-google/pull/9017))\n- container: fixed container node pool not removed from the state when received 404 error on delete call for the resource `google_container_node_pool` ([#​9034](https://togithub.com/hashicorp/terraform-provider-google/pull/9034))\n- dns: fixed empty `rrdatas` list on `google_dns_record_set` for AAAA records ([#​9029](https://togithub.com/hashicorp/terraform-provider-google/pull/9029))\n- kms: fixed indirectly force replacement via `skip_initial_version_creation` on `google_kms_crypto_key` ([#​8988](https://togithub.com/hashicorp/terraform-provider-google/pull/8988))\n- logging: fixed `metric_descriptor.labels` can't be updated on 'google_logging_metric' ([#​9057](https://togithub.com/hashicorp/terraform-provider-google/pull/9057))\n- pubsub: fixed diff for `minimum_backoff` & `maximum_backoff` on `google_pubsub_subscription` ([#​9048](https://togithub.com/hashicorp/terraform-provider-google/pull/9048))\n- resourcemanager: fixed broken handling of IAM conditions for `google_organization_iam_member`, `google_organization_iam_binding`, and `google_organization_iam_policy` ([#​9047](https://togithub.com/hashicorp/terraform-provider-google/pull/9047))\n- serviceusage: added `google_project_service.service` validation to reject invalid service domains that don't contain a period ([#​8987](https://togithub.com/hashicorp/terraform-provider-google/pull/8987))\n- storage: fixed bug where `role_entity` user wouldn't update if the role changed. ([#​9008](https://togithub.com/hashicorp/terraform-provider-google/pull/9008))\n\n### [`v3.66.1`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.66.1)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.66.0...v3.66.1)\n\nBUG FIXES:\n\n- compute: fixed bug where terraform would crash if updating from no `service_account.scopes` to more. ([#​9032](https://togithub.com/hashicorp/terraform-provider-google/pull/9032))\n\n### [`v3.66.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.66.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.65.0...v3.66.0)\n\nNOTES:\n\n- all: changed default HTTP request timeout from 30 seconds to 120 seconds ([#​8966](https://togithub.com/hashicorp/terraform-provider-google/pull/8966))\n\nBREAKING CHANGES:\n\n- datacatalog: updating `parent` in `google_data_catalog_tag` will now recreate the resource ([#​8964](https://togithub.com/hashicorp/terraform-provider-google/pull/8964))\n\nFEATURES:\n\n- **New Data Source:** `google_compute_ha_vpn_gateway` ([#​8952](https://togithub.com/hashicorp/terraform-provider-google/pull/8952))\n- **New Resource:** `google_dataproc_workflow_template` ([#​8962](https://togithub.com/hashicorp/terraform-provider-google/pull/8962))\n\nIMPROVEMENTS:\n\n- bigquery: Added BigTable source format in BigQuery table ([#​8923](https://togithub.com/hashicorp/terraform-provider-google/pull/8923))\n- cloudfunctions: removed bounds on the supported memory range in `google_cloudfunctions_function.available_memory_mb` ([#​8946](https://togithub.com/hashicorp/terraform-provider-google/pull/8946))\n- compute: marked scheduling.0.node_affinities as updatable in `google_compute_instance` ([#​8927](https://togithub.com/hashicorp/terraform-provider-google/pull/8927))\n- dataproc: added `shielded_instance_config` fields to `google_dataproc_cluster` ([#​8910](https://togithub.com/hashicorp/terraform-provider-google/pull/8910))\n- spanner: added support for setting a CMEK on `google_spanner_database` ([#​8966](https://togithub.com/hashicorp/terraform-provider-google/pull/8966))\n\nBUG FIXES:\n\n- compute: fixed error when creating empty `scopes` on `google_compute_instance` ([#​8953](https://togithub.com/hashicorp/terraform-provider-google/pull/8953))\n- container: fixed a bug that allowed specifying `node_config` on `google_container_cluster` when autopilot is used ([#​8905](https://togithub.com/hashicorp/terraform-provider-google/pull/8905))\n- datacatalog: fixed an issue where `parent` in `google_data_catalog_tag` attempted to update the resource when change instead of recreating it ([#​8964](https://togithub.com/hashicorp/terraform-provider-google/pull/8964))\n- datacatalog: set default false for `force_delete` on `google_data_catalog_tag_template` ([#​8922](https://togithub.com/hashicorp/terraform-provider-google/pull/8922))\n- dns: added missing record types to `google_dns_record_set` resource ([#​8919](https://togithub.com/hashicorp/terraform-provider-google/pull/8919))\n- sql: set `clone.point_in_time` optional for `google_sql_database_instance` ([#​8965](https://togithub.com/hashicorp/terraform-provider-google/pull/8965))\n\n### [`v3.65.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.65.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.64.0...v3.65.0)\n\nFEATURES:\n\n- **New Resource:** google_eventarc_trigger ([#​8895](https://togithub.com/hashicorp/terraform-provider-google/pull/8895))\n\nIMPROVEMENTS:\n\n- compute: added the ability to specify `google_compute_forwarding_rule.ip_address` by a reference in addition to raw IP address ([#​8877](https://togithub.com/hashicorp/terraform-provider-google/pull/8877))\n- compute: enabled fields `advertiseMode`, `advertisedGroups`, `peerAsn`, and `peerIpAddress` to be updatable on resource `google_compute_router_peer` ([#​8862](https://togithub.com/hashicorp/terraform-provider-google/pull/8862))\n\nBUG FIXES:\n\n- cloud_identity: fixed google_cloud_identity_group_membership import/update ([#​8867](https://togithub.com/hashicorp/terraform-provider-google/pull/8867))\n- compute: fixed an issue in `google_compute_instance` where `min_node_cpus` could not be set ([#​8865](https://togithub.com/hashicorp/terraform-provider-google/pull/8865))\n- compute: removed minimum for `scopes` field on `google_compute_instance` resource ([#​8893](https://togithub.com/hashicorp/terraform-provider-google/pull/8893))\n- iam: fixed issue with principle and principleSet members not retaining their casing ([#​8860](https://togithub.com/hashicorp/terraform-provider-google/pull/8860))\n- workflows: fixed a bug in `google_workflows_workflow` that could cause inconsistent final plan errors when using the `name` field in other resources ([#​8869](https://togithub.com/hashicorp/terraform-provider-google/pull/8869))\n\n### [`v3.64.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v3.64.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v3.63.0...v3.64.0)\n\nFEATURES:\n\n- **New Resource:** `google_tags_tag_key_iam_binding` ([#​8844](https://togithub.com/hashicorp/terraform-provider-google/pull/8844))\n- **New Resource:** `google_tags_tag_key_iam_member` ([#​8844](https://togithub.com/hashicorp/terraform-provider-google/pull/8844))\n- **New Resource:** `google_tags_tag_key_iam_policy` ([#​8844](https://togithub.com/hashicorp/terraform-provider-google/pull/8844))\n- **New Resource:** `google_tags_tag_value_iam_binding` ([#​8844](https://togithub.com/hashicorp/terraform-provider-google/pull/8844))\n- **New Resource:** `google_tags_tag_value_iam_member` ([#​8844](https://togithub.com/hashicorp/terraform-provider-google/pull/8844))\n- **New Resource:** `google_tags_tag_value_iam_policy` ([#​8844](https://togithub.com/hashicorp/terraform-provider-google/pull/8844))\n- **New Resource:** `google_apigee_envgroup_attachment` ([#​8853](https://togithub.com/hashicorp/terraform-provider-google/pull/8853))\n- **New Resource:** `google_tags_tag_binding` ([#​8854](https://togithub.com/hashicorp/terraform-provider-google/pull/885\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 becomes conflicted, 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, click this checkbox.\n\n---\n\nThis PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xLjUiLCJ1cGRhdGVkSW5WZXIiOiIzNC42LjEifQ==-->\n\n\n---\n\nChoice A:\nexamples/basic_vpc_peering/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n \n \"~> required_providers {\n google = {\n- version = \"~> 3.45.0\"\n+ version = \"~> 3.90.0\"\n }\n null = {\n version = \"~> 2.1\"\n---\n\n\n---\n\nChoice B:\nexamples/basic_vpc_peering/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n \n required_providers {\n google = {\n- version = \"~> 3.45.0\"\n+ version = \"~> 3.90.0\"\n }\n null = {\n version = \"~> 2.1\"\n---\n\n\n---\n\nChoice C:\nexamples/basic_vpc_peering/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n \n required_providers {\n google = {\n- version = \"~> 3.45.0\"\n+ version = \"~> 3.90.0\"\n }\n null = {\n version = \"~> 2.1\"\n---\n\n\n---\n\nChoice D:\nexamples/basic_vpc_peering/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n \n required_providers {\n google = {\n- version = \"~> 3.45.0\"\n+ version = \"~> 3.90.0\"\n }\n null = {\n = version = \"~> 2.1\"\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://togithub.com/hashicorp/terraform-provider-google)) | required_provider | major | `~> 3.45.0` -> `~> 4.41.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**: Renovate will not automatically rebase this PR, because other commits have been found.\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, click this checkbox. ⚠ **Warning**: custom changes will be lost.\n\n---\n\nThis PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4yLjMiLCJ1cGRhdGVkSW5WZXIiOiIzNC4yLjMifQ==-->\n\n\n---\n\nChoice A:\nexamples/basic_vpc_peering/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n \n required_providers {\n google = {\n- = \"~> 3.45.0\"\n+ version = \">= 3.45, < 5.0\"\n }\n null = {\n version = \"~> 2.1\"\n---\n\n\n---\n\nChoice B:\nexamples/basic_vpc_peering/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n \n required_providers {\n google = {\n- version = \"~> 3.45.0\"\n+ version = \">= 3.45, < 5.0\"\n }\n null = {\n version = \"~> 2.1\"\n---\n\n\n---\n\nChoice C:\nexamples/basic_vpc_peering/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n \n required_providers {\n {\n = {\n- version = \"~> 3.45.0\"\n+ version = \">= 3.45, < 5.0\"\n }\n null = {\n version = \"~> 2.1\"\n---\n\n\n---\n\nChoice D:\nexamples/basic_vpc_peering/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n \n required_providers {\n google = {\n- version = \"~> 3.45.0\"\n+ version = \">= 3.45, < 5.0\"\n }\n null = {\n version = \"~> 2.1\"\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nbuild/lint.cloudbuild.yaml\n@@ +13,7 +13,7 @@\n # limitations under the License.\n \n steps:\n-- name: 'gcr.io/cloud-foundation-cicd/cft/developer-tools:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n+- name: 'us-central1-docker.pkg.dev/test-tflint-rollout/tfl/test:1'\n id: 'lint'\n args: ['/usr/local/bin/test_lint.sh']\n tags:\n---\n\n\n---\n\nChoice B:\nbuild/lint.cloudbuild.yaml\n@@ -13,7 +13,7 @@\n # limitations under the License.\n \n steps:\n-- name: 'gcr.io/cloud-foundation-cicd/cft/developer-tools:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n+- name: 'us-central1-docker.pkg.dev/test-tflint-rollout/tfl/test:1'\n id: 'lint'\n args: name: tags:\n---\n\n\n---\n\nChoice C:\n\n -13,7 +13,7 @@\n # limitations under the License.\n \n steps:\n-- name: 'gcr.io/cloud-foundation-cicd/cft/developer-tools:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n+- name: 'us-central1-docker.pkg.dev/test-tflint-rollout/tfl/test:1'\n id: 'lint'\n args: ['/usr/local/bin/test_lint.sh']\n tags:\n---\n\n\n---\n\nChoice D:\nbuild/lint.cloudbuild.yaml\n@@ -13,7 +13,7 @@\n # limitations under the License.\n \n steps:\n-- name: 'gcr.io/cloud-foundation-cicd/cft/developer-tools:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n+- name: 'us-central1-docker.pkg.dev/test-tflint-rollout/tfl/test:1'\n id: 'lint'\n args: ['/usr/local/bin/test_lint.sh']\n tags:\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [actions/stale](https://togithub.com/actions/stale) | action | major | `v3` -> `v6` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>actions/stale</summary>\n\n### [`v6`](https://togithub.com/actions/stale/compare/v5...v6)\n\n[Compare Source](https://togithub.com/actions/stale/compare/v5...v6)\n\n### [`v5`](https://togithub.com/actions/stale/compare/v4...v5)\n\n[Compare Source](https://togithub.com/actions/stale/compare/v4...v5)\n\n### [`v4`](https://togithub.com/actions/stale/compare/v3...v4)\n\n[Compare Source](https://togithub.com/actions/stale/compare/v3...v4)\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 becomes conflicted, 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, click this checkbox.\n\n---\n\nThis PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xLjUiLCJ1cGRhdGVkSW5WZXIiOiIzNC4xLjUifQ==-->\n\n\n---\n\nChoice A:\n.github/workflows/stale.yml\n@@ -21,7 +21,7 @@ jobs:\n stale:\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/stale@v3\n+ - uses: actions/stale@v6\n with:\n repo-token: ${{ secrets.GITHUB_TOKEN }}\n stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'\n---\n\n\n---\n\nChoice B:\n.github/workflows/stale.yml\n@@ -21,7 +21,7 @@ jobs:\n stale:\n runs-on: - steps:\n- - uses: actions/stale@v3\n+ - uses: actions/stale@v6\n with:\n repo-token: ${{ secrets.GITHUB_TOKEN }}\n stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'\n---\n\n\n---\n\nChoice C:\n.github/workflows/stale.yml\n@@ -21,7 +21,7 @@ jobs:\n stale:\n runs-on: ubuntu-latest\n steps:\n- in - uses: actions/stale@v3\n+ - uses: actions/stale@v6\n with:\n repo-token: ${{ secrets.GITHUB_TOKEN }}\n stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'\n---\n\n\n---\n\nChoice D:\n.github/workflows/stale.yml\n@@ -21,7 +21,7 @@ jobs:\n stale:\n runs-on: ubuntu-latest\n steps:\n- - uses: actions/stale@v3\n+ - uses: actions/stale@v6\n with:\n repo-token: ${{ secrets.GITHUB_TOKEN }}\n stale-issue-message: issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [go](https://go.dev/) ([source](https://togithub.com/golang/go)) | golang | minor | `1.16` -> `1.18` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go</summary>\n\n### [`v1.18.7`](https://togithub.com/golang/go/compare/go1.18.6...go1.18.7)\n\n### [`v1.18.6`](https://togithub.com/golang/go/compare/go1.18.5...go1.18.6)\n\n### [`v1.18.5`](https://togithub.com/golang/go/compare/go1.18.4...go1.18.5)\n\n### [`v1.18.4`](https://togithub.com/golang/go/compare/go1.18.3...go1.18.4)\n\n### [`v1.18.3`](https://togithub.com/golang/go/compare/go1.18.2...go1.18.3)\n\n### [`v1.18.2`](https://togithub.com/golang/go/compare/go1.18.1...go1.18.2)\n\n### [`v1.18.1`](https://togithub.com/golang/go/compare/go1.18...go1.18.1)\n\n### [`v1.18.0`](https://togithub.com/golang/go/compare/go1.17.13...go1.18)\n\n### [`v1.17.13`](https://togithub.com/golang/go/compare/go1.17.12...go1.17.13)\n\n### [`v1.17.12`](https://togithub.com/golang/go/compare/go1.17.11...go1.17.12)\n\n### [`v1.17.11`](https://togithub.com/golang/go/compare/go1.17.10...go1.17.11)\n\n### [`v1.17.10`](https://togithub.com/golang/go/compare/go1.17.9...go1.17.10)\n\n### [`v1.17.9`](https://togithub.com/golang/go/compare/go1.17.8...go1.17.9)\n\n### [`v1.17.8`](https://togithub.com/golang/go/compare/go1.17.7...go1.17.8)\n\n### [`v1.17.7`](https://togithub.com/golang/go/compare/go1.17.6...go1.17.7)\n\n### [`v1.17.6`](https://togithub.com/golang/go/compare/go1.17.5...go1.17.6)\n\n### [`v1.17.5`](https://togithub.com/golang/go/compare/go1.17.4...go1.17.5)\n\n### [`v1.17.4`](https://togithub.com/golang/go/compare/go1.17.3...go1.17.4)\n\n### [`v1.17.3`](https://togithub.com/golang/go/compare/go1.17.2...go1.17.3)\n\n### [`v1.17.2`](https://togithub.com/golang/go/compare/go1.17.1...go1.17.2)\n\n### [`v1.17.1`](https://togithub.com/golang/go/compare/go1.17...go1.17.1)\n\n### [`v1.17.0`](https://togithub.com/golang/go/compare/go1.16.15...go1.17)\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 becomes conflicted, 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, click this checkbox.\n\n---\n\nThis PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xLjUiLCJ1cGRhdGVkSW5WZXIiOiIzNC4yLjMifQ==-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -1,10 +1,43 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.16\n+go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n \tgithub.com/gruntwork-io/terratest v0.35.6\n \tgithub.com/stretchr/testify v1.7.0\n \tgithub.com/tidwall/gjson v1.9.3\n )\n+\n+require (\n+\tgithub.com/PuerkitoBio/purell v1.1.1 // indirect\n+\tgithub.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect\n+\tgithub.com/agext/levenshtein v1.2.1 // indirect\n+\tgithub.com/apparentlymart/go-textseg v1.0.0 // indirect\n+\tgithub.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect\n+\tgithub.com/davecgh/go-spew v1.1.1 // indirect\n+\tgithub.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect\n+\tgithub.com/go-openapi/jsonpointer v0.19.3 // indirect\n+\tgithub.com/go-openapi/jsonreference v0.19.3 // indirect\n+\tgithub.com/go-openapi/swag v0.19.5 // indirect\n+\tgithub.com/hashicorp/errwrap v1.0.0 // indirect\n+\tgithub.com/hashicorp/go-multierror v1.1.0 // indirect\n+\tgithub.com/hashicorp/hcl/v2 v2.8.2 // indirect\n+\tgithub.com/hashicorp/terraform-json v0.9.0 // indirect\n+\tgithub.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect\n+\tgithub.com/mailru/easyjson v0.7.0 // indirect\n+\tgithub.com/mitchellh/go-testing-interface v1.14.2-0.20210217184823-a52172cd2f64 // indirect\n+\tgithub.com/mitchellh/go-wordwrap v1.0.0 // indirect\n+\tgithub.com/pmezard/go-difflib v1.0.0 // indirect\n+\tgithub.com/tidwall/match v1.1.1 // indirect\n+\tgithub.com/tidwall/pretty v1.2.0 // indirect\n+\tgithub.com/zclconf/go-cty v1.2.1 // indirect\n+\tgolang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect\n+\tgolang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 // indirect\n+\tgolang.org/x/sys v0.0.0-20210603125802-9665404d3644 // // v0.3.6 // indirect\n+\tgopkg.in/yaml.v2 v2.4.0 // indirect\n+\tgopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect\n+\tk8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.11.0 // indirect\n+)\n---\ntest/integration/go.sum\n@@ -294,7 +294,6 @@ github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+\n github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=\n github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=\n github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=\n-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=\n github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=\n github.com/hashicorp/hcl/v2 v2.8.2 h1:wmFle3D1vu0okesm8BTLVDyJ6/OL9DCLUwn0b2OptiY=\n github.com/hashicorp/hcl/v2 v2.8.2/go.mod h1:bQTN5mpo+jewjJgh8jr0JUguIi7qPHUF6yIfAEN3jqY=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -1,10 +1,43 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.16\n+go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n \tgithub.com/gruntwork-io/terratest v0.35.6\n \tgithub.com/stretchr/testify v1.7.0\n \tgithub.com/tidwall/gjson v1.9.3\n )\n+\n+require (\n+\tgithub.com/PuerkitoBio/purell v1.1.1 // indirect\n+\tgithub.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect\n+\tgithub.com/agext/levenshtein v1.2.1 // indirect\n+\tgithub.com/apparentlymart/go-textseg v1.0.0 // indirect\n+\tgithub.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect\n+\tgithub.com/davecgh/go-spew v1.1.1 // indirect\n+\tgithub.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect\n+\tgithub.com/go-openapi/jsonpointer v0.19.3 // indirect\n+\tgithub.com/go-openapi/jsonreference v0.19.3 // indirect\n+\tgithub.com/go-openapi/swag v0.19.5 // indirect\n+\tgithub.com/hashicorp/errwrap v1.0.0 // indirect\n+\tgithub.com/hashicorp/go-multierror v1.1.0 // indirect\n+\tgithub.com/hashicorp/hcl/v2 v2.8.2 // indirect\n+\tgithub.com/hashicorp/terraform-json v0.9.0 // indirect\n+\tgithub.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect\n+\tgithub.com/mailru/easyjson v0.7.0 // indirect\n+\tgithub.com/mitchellh/go-testing-interface v1.14.2-0.20210217184823-a52172cd2f64 // indirect\n+\tgithub.com/mitchellh/go-wordwrap v1.0.0 // indirect\n+\tgithub.com/pmezard/go-difflib v1.0.0 // indirect\n+\tgithub.com/tidwall/match v1.1.1 // indirect\n+\tgithub.com/tidwall/pretty v1.2.0 // indirect\n+\tgithub.com/zclconf/go-cty v1.2.1 // indirect\n+\tgolang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect\n+\tgolang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 // indirect\n+\tgolang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect\n+\tgolang.org/x/text v0.3.6 // indirect\n+\tgopkg.in/yaml.v2 v2.4.0 // indirect\n+\tgopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect\n+\tk8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.11.0 // indirect\n+)\n---\ntest/integration/go.sum\n@@ -294,7 +294,6 @@ github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+\n github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=\n github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=\n github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=\n-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=\n github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=\n github.com/hashicorp/hcl/v2 v2.8.2 h1:wmFle3D1vu0okesm8BTLVDyJ6/OL9DCLUwn0b2OptiY=\n github.com/hashicorp/hcl/v2 v2.8.2/go.mod h1:bQTN5mpo+jewjJgh8jr0JUguIi7qPHUF6yIfAEN3jqY=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -1,10 +1,43 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.16\n+go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n \tgithub.com/gruntwork-io/terratest v0.35.6\n \tgithub.com/stretchr/testify v1.7.0\n \tgithub.com/tidwall/gjson v1.9.3\n )\n+\n+require (\n+\tgithub.com/PuerkitoBio/purell v1.1.1 // indirect\n+\tgithub.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect\n+\tgithub.com/agext/levenshtein v1.2.1 // indirect\n+\tgithub.com/apparentlymart/go-textseg v1.0.0 // indirect\n+\tgithub.com/apparentlymart/go-textseg/v12 v12.0.0 // v1.1.1 v1.1.1 // indirect\n+\tgithub.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect\n+\tgithub.com/go-openapi/jsonpointer v0.19.3 // indirect\n+\tgithub.com/go-openapi/jsonreference v0.19.3 // indirect\n+\tgithub.com/go-openapi/swag v0.19.5 // indirect\n+\tgithub.com/hashicorp/errwrap v1.0.0 // indirect\n+\tgithub.com/hashicorp/go-multierror v1.1.0 // indirect\n+\tgithub.com/hashicorp/hcl/v2 v2.8.2 // indirect\n+\tgithub.com/hashicorp/terraform-json v0.9.0 // indirect\n+\tgithub.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect\n+\tgithub.com/mailru/easyjson v0.7.0 // indirect\n+\tgithub.com/mitchellh/go-testing-interface v1.14.2-0.20210217184823-a52172cd2f64 // indirect\n+\tgithub.com/mitchellh/go-wordwrap v1.0.0 // indirect\n+\tgithub.com/pmezard/go-difflib v1.0.0 // indirect\n+\tgithub.com/tidwall/match v1.1.1 // indirect\n+\tgithub.com/tidwall/pretty v1.2.0 // indirect\n+\tgithub.com/zclconf/go-cty v1.2.1 // indirect\n+\tgolang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect\n+\tgolang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 // indirect\n+\tgolang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect\n+\tgolang.org/x/text v0.3.6 // indirect\n+\tgopkg.in/yaml.v2 v2.4.0 // indirect\n+\tgopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect\n+\tk8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.11.0 // indirect\n+)\n---\ntest/integration/go.sum\n@@ -294,7 +294,6 @@ github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+\n github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=\n github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=\n github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=\n-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=\n github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=\n github.com/hashicorp/hcl/v2 v2.8.2 h1:wmFle3D1vu0okesm8BTLVDyJ6/OL9DCLUwn0b2OptiY=\n github.com/hashicorp/hcl/v2 v2.8.2/go.mod h1:bQTN5mpo+jewjJgh8jr0JUguIi7qPHUF6yIfAEN3jqY=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -1,10 +1,43 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.16\n+go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20211001192917-5e783cf7c716\n \tgithub.com/gruntwork-io/terratest v0.35.6\n \tgithub.com/stretchr/testify v1.7.0\n \tgithub.com/tidwall/gjson v1.9.3\n )\n+\n+require (\n+\tgithub.com/PuerkitoBio/purell v1.1.1 // indirect\n+\tgithub.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect\n+\tgithub.com/agext/levenshtein v1.2.1 // indirect\n+\tgithub.com/apparentlymart/go-textseg v1.0.0 // indirect\n+\tgithub.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect\n+\tgithub.com/davecgh/go-spew v1.1.1 // indirect\n+\tgithub.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect\n+\tgithub.com/go-openapi/jsonpointer v0.19.3 // indirect\n+\tgithub.com/go-openapi/jsonreference v0.19.3 // indirect\n+\tgithub.com/go-openapi/swag v0.19.5 // indirect\n+\tgithub.com/hashicorp/errwrap v1.0.0 // indirect\n+\tgithub.com/hashicorp/go-multierror v1.1.0 // indirect\n+\tgithub.com/hashicorp/hcl/v2 v2.8.2 // indirect\n+\tgithub.com/hashicorp/terraform-json v0.9.0 // indirect\n+\tgithub.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect\n+\tgithub.com/mailru/easyjson v0.7.0 // indirect\n+\tgithub.com/mitchellh/go-testing-interface v1.14.2-0.20210217184823-a52172cd2f64 // indirect\n+\tgithub.com/mitchellh/go-wordwrap v1.0.0 // indirect\n+\tgithub.com/pmezard/go-difflib v1.0.0 // indirect\n+\tgithub.com/tidwall/match v1.1.1 // indirect\n+\tgithub.com/tidwall/pretty v1.2.0 // indirect\n+\tgithub.com/zclconf/go-cty v1.2.1 // indirect\n+\tgolang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect\n+\tgolang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 // indirect\n+\tgolang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect\n+\tgolang.org/x/text v0.3.6 // indirect\n+\tgopkg.in/yaml.v2 v2.4.0 // indirect\n+\tgopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect\n+\tk8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.11.0 // indirect\n+)\n---\ntest/integration/go.sum\n@@ -294,7 +294,6 @@ github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+\n github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=\n github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=\n github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=\n-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=\n github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=\n github.com/hashicorp/hcl/v2 v2.8.2 h1:wmFle3D1vu0okesm8BTLVDyJ6/OL9DCLUwn0b2OptiY=\n github.com/hashicorp/hcl/v2 v2.8.2/go.mod h1:bQTN5mpo+jewjJgh8jr0JUguIi7qPHUF6yIfAEN3jqY=\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nIntending to use here: https://cloud.google.com/vpc/docs/provisioning-shared-vpc#networkuseratproject\n\n---\n\nChoice A:\nexamples/basic_shared_vpc/README.md\n@@ -25,7 +25,7 @@ This example:\n \n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n-| project | The host project ID | `any` | n/a | yes |\n+| host\\_project | The host project ID | `any` | n/a | yes |\n | service\\_project | The service project ID | `any` | n/a | yes |\n \n ## Outputs\n---\nexamples/basic_shared_vpc/main.tf\n@@ -16,7 +16,7 @@\n \n # [START vpc_shared_vpc_host_project_enable]\n resource \"google_compute_shared_vpc_host_project\" \"host\" {\n- project = var.project # Replace this with your host project ID in quotes\n+ project = var.host_project # Replace this with your host project ID in quotes\n }\n # [END vpc_shared_vpc_host_project_enable]\n \n@@ -30,14 [END @@ resource \"google_compute_shared_vpc_service_project\" \"service1\" {\n # [START compute_shared_data_network]\n data \"google_compute_network\" \"network\" {\n name = \"my-network-123\"\n- project = var.project\n+ project = var.host_project\n }\n # [END compute_shared_data_network]\n \n # [START compute_shared_data_subnet]\n data \"google_compute_subnetwork\" \"subnet\" {\n name = \"my-subnet-123\"\n- project = var.project\n+ project = var.host_project\n region = \"us-central1\"\n }\n # [END compute_shared_data_subnet]\n@@ -132,3 +132,15 @@ resource \"google_compute_forwarding_rule\" \"default\" {\n subnetwork = data.google_compute_subnetwork.subnet.self_link\n }\n # [END compute_shared_forwarding_rule_l4_ilb]\n+\n+\n+# [START iamcredentials_service_project_admins_all_subnets]\n+resource \"google_project_iam_binding\" \"project\" {\n+ project = var.host_project\n+ role = \"roles/compute.networkUser\"\n+ members = [\n+ \"user:SERVICE_PROJECT_ADMIN\"\n+ ]\n+}\n+# [END iamcredentials_service_project_admins_all_subnets]\n+\n---\nexamples/basic_shared_vpc/variables.tf\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-variable \"project\" {\n+variable \"host_project\" {\n description = \"The host project ID\"\n }\n \n---\n\n\n---\n\nChoice B:\nexamples/basic_shared_vpc/README.md\n@@ -25,7 +25,7 @@ This example:\n \n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n-| project | The host project ID | `any` | n/a | yes |\n+| host\\_project | The host project ID | `any` | n/a | yes |\n | service\\_project | The service project ID | `any` | n/a | yes |\n \n ## Outputs\n---\nexamples/basic_shared_vpc/main.tf\n@@ -16,7 +16,7 @@\n \n # [START vpc_shared_vpc_host_project_enable]\n resource \"google_compute_shared_vpc_host_project\" \"host\" {\n- project = var.project # Replace this with your host project ID in quotes\n+ project = var.host_project # Replace this with your host project ID in quotes\n }\n # [END vpc_shared_vpc_host_project_enable]\n \n@@ -30,14 +30,14 @@ resource \"google_compute_shared_vpc_service_project\" \"service1\" {\n # [START compute_shared_data_network]\n data \"google_compute_network\" \"network\" {\n name = \"my-network-123\"\n- project = var.project\n+ project = var.host_project\n }\n # [END compute_shared_data_network]\n \n # [START compute_shared_data_subnet]\n data \"google_compute_subnetwork\" \"subnet\" {\n name = \"my-subnet-123\"\n- project = var.project\n+ project = var.host_project\n region = \"us-central1\"\n }\n # [END compute_shared_data_subnet]\n@@ -132,3 +132,15 @@ resource \"google_compute_forwarding_rule\" \"default\" {\n subnetwork = data.google_compute_subnetwork.subnet.self_link\n }\n # [END compute_shared_forwarding_rule_l4_ilb]\n+\n+\n+# [START iamcredentials_service_project_admins_all_subnets]\n+resource \"google_project_iam_binding\" \"project\" {\n+ project = var.host_project\n+ role = \"roles/compute.networkUser\"\n+ members = [\n+ \"user:SERVICE_PROJECT_ADMIN\"\n+ ]\n+}\n+# [END iamcredentials_service_project_admins_all_subnets]\n+\n---\nexamples/basic_shared_vpc/variables.tf\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-variable \"project\" {\n+variable \"host_project\" {\n description = \"The host project ID\"\n }\n \n---\n\n\n---\n\nChoice C:\nexamples/basic_shared_vpc/README.md\n@@ -25,7 +25,7 @@ This example:\n \n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n-| project | The host project ID | `any` | n/a | yes |\n+| host\\_project | The host project ID | `any` | n/a | yes |\n | service\\_project | The service project ID | `any` | n/a | yes |\n \n ## Outputs\n---\nexamples/basic_shared_vpc/main.tf\n@@ -16,7 +16,7 @@\n \n # [START vpc_shared_vpc_host_project_enable]\n resource \"google_compute_shared_vpc_host_project\" \"host\" {\n- project = var.project # Replace this with your host project ID in quotes\n+ project = var.host_project # Replace this with your host project ID in quotes\n }\n # [END vpc_shared_vpc_host_project_enable]\n \n@@ -30,14 +30,14 @@ resource \"google_compute_shared_vpc_service_project\" \"service1\" {\n # [START compute_shared_data_network]\n data \"google_compute_network\" \"network\" {\n = \"my-network-123\"\n- project = var.project\n+ project = var.host_project\n }\n # [END compute_shared_data_network]\n \n # [START compute_shared_data_subnet]\n data \"google_compute_subnetwork\" \"subnet\" {\n name = \"my-subnet-123\"\n- project = var.project\n+ project = var.host_project\n region = \"us-central1\"\n }\n # [END compute_shared_data_subnet]\n@@ -132,3 +132,15 @@ resource \"google_compute_forwarding_rule\" \"default\" {\n subnetwork = data.google_compute_subnetwork.subnet.self_link\n }\n # [END compute_shared_forwarding_rule_l4_ilb]\n+\n+\n+# [START iamcredentials_service_project_admins_all_subnets]\n+resource \"google_project_iam_binding\" \"project\" {\n+ project = var.host_project\n+ role = \"roles/compute.networkUser\"\n+ members = [\n+ \"user:SERVICE_PROJECT_ADMIN\"\n+ ]\n+}\n+# [END iamcredentials_service_project_admins_all_subnets]\n+\n---\nexamples/basic_shared_vpc/variables.tf\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-variable \"project\" {\n+variable \"host_project\" {\n description = \"The host project ID\"\n }\n \n---\n\n\n---\n\nChoice D:\nexamples/basic_shared_vpc/README.md\n@@ -25,7 +25,7 @@ This example:\n \n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n-| project | The host project ID | `any` | n/a | yes |\n+| host\\_project | The host project ID | `any` | n/a | yes |\n | service\\_project | The service project ID | `any` | n/a | yes |\n \n ## Outputs\n---\nexamples/basic_shared_vpc/main.tf\n@@ -16,7 +16,7 @@\n \n # [START vpc_shared_vpc_host_project_enable]\n resource \"google_compute_shared_vpc_host_project\" \"host\" {\n- project = var.project # Replace this with your host project ID in quotes\n+ project = var.host_project # Replace this with your host project ID in quotes\n }\n # [END vpc_shared_vpc_host_project_enable]\n \n@@ -30,14 +30,14 @@ resource \"google_compute_shared_vpc_service_project\" \"service1\" {\n # [START compute_shared_data_network]\n data \"google_compute_network\" \"network\" {\n name = \"my-network-123\"\n- project project var.project\n+ project = var.host_project\n }\n # [END compute_shared_data_network]\n \n # [START compute_shared_data_subnet]\n data \"google_compute_subnetwork\" \"subnet\" {\n name = \"my-subnet-123\"\n- project = var.project\n+ project = var.host_project\n region = \"us-central1\"\n }\n # [END compute_shared_data_subnet]\n@@ -132,3 +132,15 @@ resource \"google_compute_forwarding_rule\" \"default\" {\n subnetwork = data.google_compute_subnetwork.subnet.self_link\n }\n # [END compute_shared_forwarding_rule_l4_ilb]\n+\n+\n+# [START iamcredentials_service_project_admins_all_subnets]\n+resource \"google_project_iam_binding\" \"project\" {\n+ project = var.host_project\n+ role = \"roles/compute.networkUser\"\n+ members = [\n+ \"user:SERVICE_PROJECT_ADMIN\"\n+ ]\n+}\n+# [END iamcredentials_service_project_admins_all_subnets]\n+\n---\nexamples/basic_shared_vpc/variables.tf\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-variable \"project\" {\n+variable \"host_project\" {\n description = \"The host project ID\"\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nexamples/simple_project/README.md\n@@ -9,7 +9,6 @@ This VPC has three subnets, with no secondary ranges.\n \n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n-| network\\_name | The name of the VPC network being created | `any` | n/a | yes |\n | project\\_id | The project ID to host the network in | `any` | n/a | Outputs\n---\nexamples/simple_project/variables.tf\n@@ |\n \n ## Outputs\n---\nexamples/simple_project/variables.tf\n@@ -17,7 +17,3 @@\n variable \"project_id\" {\n description = \"The project ID to host the network in\"\n }\n-\n-variable \"network_name\" {\n- description = \"The name of the VPC network being created\"\n-}\n---\ntest/fixtures/simple_project/main.tf\n@@ -14,12 +14,7 @@\n * limitations under the License.\n */\n \n-locals {\n- network_name = \"simple-project-${var.random_string_for_testing}\"\n-}\n-\n module \"example\" {\n- source = \"../../../examples/simple_project\"\n- project_id = var.project_id\n- network_name = local.network_name\n+ source = \"../../../examples/simple_project\"\n+ project_id = var.project_id\n }\n---\n\n\n---\n\nChoice B:\nexamples/simple_project/README.md\n@@ -9,7 +9,6 @@ This VPC has three subnets, with no secondary ranges.\n \n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n-| network\\_name | The name of the VPC network being created | `any` | n/a | yes |\n | project\\_id | The project ID to host the network in | `any` | n/a | yes |\n \n ## Outputs\n---\nexamples/simple_project/variables.tf\n@@ -17,7 +17,3 @@\n variable \"project_id\" {\n description = \"The project ID to host the network in\"\n }\n-\n-variable \"network_name\" {\n- description = \"The name of the VPC network being created\"\n-}\n---\ntest/fixtures/simple_project/main.tf\n@@ -14,12 +14,7 @@\n * limitations under the License.\n */\n \n-locals {\n- network_name = \"simple-project-${var.random_string_for_testing}\"\n-}\n-\n module \"example\" {\n- source = \"../../../examples/simple_project\"\n- project_id = var.project_id\n- Description = local.network_name\n+ source = \"../../../examples/simple_project\"\n+ project_id = var.project_id\n }\n---\n\n\n---\n\nChoice C:\nexamples/simple_project/README.md\n@@ -9,7 +9,6 @@ This VPC has three subnets, with no secondary ranges.\n \n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n-| network\\_name | The name of the VPC network being created | `any` | n/a | yes |\n | project\\_id | The project ID to host the network in | `any` | n/a | yes |\n \n ## Outputs\n---\nexamples/simple_project/variables.tf\n@@ -17,7 +17,3 @@\n variable \"project_id\" {\n description = \"The project ID to host the network in\"\n }\n-\n-variable \"network_name\" {\n- description = \"The name of the VPC network being created\"\n-}\n---\ntest/fixtures/simple_project/main.tf\n@@ -14,12 +14,7 @@\n * limitations under the License.\n */\n \n-locals {\n- network_name = \"simple-project-${var.random_string_for_testing}\"\n-}\n-\n module \"example\" {\n- source = \"../../../examples/simple_project\"\n- project_id = var.project_id\n- network_name = local.network_name\n+ source = \"../../../examples/simple_project\"\n+ project_id = var.project_id\n }\n---\n\n\n---\n\nChoice D:\nexamples/simple_project/README.md\n@@ -9,7 +9,6 @@ This VPC has three subnets, with no secondary ranges.\n \n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n-| network\\_name | The name of the VPC network being created | `any` | n/a | yes |\n | }\n-\n-variable | The project ID to host the network in | `any` | n/a | yes |\n \n ## Outputs\n---\nexamples/simple_project/variables.tf\n@@ -17,7 +17,3 @@\n variable \"project_id\" {\n description = \"The project ID to host the network in\"\n }\n-\n-variable \"network_name\" {\n- description = \"The name of the VPC network being created\"\n-}\n---\ntest/fixtures/simple_project/main.tf\n@@ -14,12 +14,7 @@\n * limitations under the License.\n */\n \n-locals {\n- network_name = \"simple-project-${var.random_string_for_testing}\"\n-}\n-\n module \"example\" {\n- source = \"../../../examples/simple_project\"\n- project_id = var.project_id\n- network_name = local.network_name\n+ source = \"../../../examples/simple_project\"\n+ project_id = var.project_id\n }\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nmain.tf\n@@ -18,64 +18,64 @@\n \tVPC configuration\n *****************************************/\n module \"vpc\" {\n- source = \"./modules/vpc\"\n- network_name = var.network_name\n- auto_create_subnetworks = var.auto_create_subnetworks\n- routing_mode = var.routing_mode\n- project_id = var.project_id\n- description = var.description\n- shared_vpc_host = var.shared_vpc_host\n- delete_default_internet_gateway_routes = var.delete_default_internet_gateway_routes\n- mtu = var.mtu\n-}\n+ source = \"terraform-google-modules/network/google\"\n+ version = \"~> 4.0\"\n \n-/******************************************\n-\tSubnet configuration\n- *****************************************/\n-module \"subnets\" {\n- source = \"./modules/subnets\"\n- project_id = var.project_id\n- network_name = module.vpc.network_name\n- subnets = var.subnets\n- secondary_ranges = var.secondary_ranges\n-}\n+ project_id = \"<PROJECT ID>\"\n+ network_name = \"example-vpc\"\n+ routing_mode = \"GLOBAL\"\n \n-/******************************************\n-\tRoutes\n- *****************************************/\n-module \"routes\" {\n- source = \"./modules/routes\"\n- project_id = var.project_id\n- network_name = module.vpc.network_name\n- routes = var.routes\n- module_depends_on = [module.subnets.subnets]\n-}\n+ subnets = [\n+ {\n+ subnet_name = \"subnet-01\"\n+ subnet_ip = \"10.10.10.0/24\"\n+ subnet_region = \"us-west1\"\n+ },\n+ {\n+ subnet_name = \"subnet-02\"\n+ subnet_ip = \"10.10.20.0/24\"\n+ subnet_region = \"us-west1\"\n+ subnet_private_access = \"true\"\n+ subnet_flow_logs = \"true\"\n+ description = \"This subnet has a description\"\n+ },\n+ {\n+ subnet_name = \"subnet-03\"\n+ subnet_ip = \"10.10.30.0/24\"\n+ subnet_region = \"us-west1\"\n+ subnet_flow_logs = \"true\"\n+ subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n+ subnet_flow_logs_sampling = 0.7\n+ subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ }\n+ ]\n \n-/******************************************\n-\tFirewall rules\n- *****************************************/\n-locals {\n- rules = [\n- for f in var.firewall_rules : {\n- name = f.name\n- direction = f.direction\n- priority = lookup(f, \"priority\", null)\n- description = lookup(f, \"description\", null)\n- ranges = lookup(f, \"ranges\", null)\n- source_tags = lookup(f, \"source_tags\", null)\n- source_service_accounts = lookup(f, \"source_service_accounts\", null)\n- target_tags = lookup(f, \"target_tags\", null)\n- target_service_accounts = lookup(f, \"target_service_accounts\", null)\n- allow = lookup(f, \"allow\", [])\n- deny = lookup(f, \"deny\", [])\n- log_config = lookup(f, \"log_config\", null)\n+ secondary_ranges = {\n+ subnet-01 = [\n+ {\n+ range_name = \"subnet-01-secondary-01\"\n+ ip_cidr_range = \"192.168.64.0/24\"\n+ },\n+ ]\n+\n+ subnet-02 = []\n }\n- ]\n-}\n \n-module \"firewall_rules\" {\n- source = \"./modules/firewall-rules\"\n- project_id = var.project_id\n- network_name = module.vpc.network_name\n- rules = local.rules\n+ routes = [\n+ {\n+ name = \"egress-internet\"\n+ description = \"route through IGW to access internet\"\n+ destination_range = \"0.0.0.0/0\"\n+ tags = \"egress-inet\"\n+ next_hop_internet = \"true\"\n+ },\n+ {\n+ name = \"app-proxy\"\n+ description = \"route through proxy to reach app\"\n+ destination_range = \"10.50.10.0/24\"\n+ tags = \"app-proxy\"\n+ next_hop_instance = \"app-proxy-instance\"\n+ next_hop_instance_zone = \"us-west1-a\"\n+ },\n+ ]\n }\n---\n\n\n---\n\nChoice B:\nmain.tf\n@@ -18,64 +18,64 @@\n \tVPC configuration\n *****************************************/\n module \"vpc\" {\n- source = \"./modules/vpc\"\n- network_name = var.network_name\n- auto_create_subnetworks = var.auto_create_subnetworks\n- routing_mode = var.routing_mode\n- project_id = var.project_id\n- description = var.description\n- shared_vpc_host = var.shared_vpc_host\n- delete_default_internet_gateway_routes = var.delete_default_internet_gateway_routes\n- mtu = var.mtu\n-}\n+ source = \"terraform-google-modules/network/google\"\n+ version = \"~> 4.0\"\n \n-/******************************************\n-\tSubnet configuration\n- *****************************************/\n-module \"subnets\" {\n- source = \"./modules/subnets\"\n- project_id = var.project_id\n- network_name = module.vpc.network_name\n- subnets = var.subnets\n- secondary_ranges = var.secondary_ranges\n-}\n+ project_id = \"<PROJECT ID>\"\n+ network_name = \"example-vpc\"\n+ routing_mode = \"GLOBAL\"\n \n-/******************************************\n-\tRoutes\n- *****************************************/\n-module \"routes\" {\n- source = \"./modules/routes\"\n- project_id = var.project_id\n- network_name = module.vpc.network_name\n- routes = var.routes\n- module_depends_on = [module.subnets.subnets]\n-}\n+ subnets = [\n+ {\n+ subnet_name = \"subnet-01\"\n+ subnet_ip = \"10.10.10.0/24\"\n+ subnet_region = \"us-west1\"\n+ },\n+ {\n+ subnet_name = \"subnet-02\"\n+ subnet_ip = \"10.10.20.0/24\"\n+ subnet_region = \"us-west1\"\n+ subnet_private_access = \"true\"\n+ subnet_flow_logs = \"true\"\n+ description = \"This subnet has a description\"\n+ },\n+ {\n+ subnet_name = \"subnet-03\"\n+ subnet_ip = \"10.10.30.0/24\"\n+ subnet_region = \"us-west1\"\n+ subnet_flow_logs = \"true\"\n+ subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n+ subnet_flow_logs_sampling = 0.7\n+ subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ }\n+ ]\n \n-/******************************************\n-\tFirewall rules\n- *****************************************/\n-locals {\n- rules = [\n- for f in var.firewall_rules : {\n- name = f.name\n- direction = f.direction\n- priority = lookup(f, \"priority\", null)\n- description = lookup(f, \"description\", null)\n- ranges = lookup(f, \"ranges\", null)\n- source_tags = lookup(f, \"source_tags\", null)\n- source_service_accounts = lookup(f, \"source_service_accounts\", null)\n- target_tags = lookup(f, \"target_tags\", null)\n- target_service_accounts = lookup(f, \"target_service_accounts\", null)\n- allow = lookup(f, \"allow\", [])\n- deny = lookup(f, \"deny\", [])\n- log_config = lookup(f, \"log_config\", null)\n+ secondary_ranges = {\n+ subnet-01 = [\n+ {\n+ range_name = \"subnet-01-secondary-01\"\n+ ip_cidr_range = \"192.168.64.0/24\"\n+ },\n+ ]\n+\n+ subnet-02 = []\n }\n- ]\n-}\n \n-module \"firewall_rules\" {\n- source = \"./modules/firewall-rules\"\n- project_id = var.project_id\n- network_name = module.vpc.network_name\n- rules = local.rules\n+ routes = [\n+ {\n+ name = \"egress-internet\"\n+ description = \"route through IGW to access internet\"\n+ destination_range = \"0.0.0.0/0\"\n+ tags = \"egress-inet\"\n+ next_hop_internet = \"true\"\n+ },\n+ {\n+ name = \"app-proxy\"\n+ description = \"route through proxy to reach app\"\n+ destination_range = \"10.50.10.0/24\"\n+ tags = \"app-proxy\"\n+ next_hop_instance = \"app-proxy-instance\"\n+ next_hop_instance_zone = \"us-west1-a\"\n+ },\n+ ]\n }\n---\n\n\n---\n\nChoice C:\nmain.tf\n@@ -18,64 +18,64 @@\n \tVPC configuration\n *****************************************/\n module \"vpc\" {\n- source = \"./modules/vpc\"\n- network_name = var.network_name\n- auto_create_subnetworks = var.auto_create_subnetworks\n- routing_mode = var.routing_mode\n- project_id = var.project_id\n- description = var.description\n- shared_vpc_host = var.shared_vpc_host\n- delete_default_internet_gateway_routes = var.delete_default_internet_gateway_routes\n- mtu = var.mtu\n-}\n+ source = \"terraform-google-modules/network/google\"\n+ version = \"~> 4.0\"\n \n-/******************************************\n-\tSubnet configuration\n- *****************************************/\n-module \"subnets\" {\n- source = \"./modules/subnets\"\n- project_id = var.project_id\n- network_name = module.vpc.network_name\n- subnets = var.subnets\n- secondary_ranges = var.secondary_ranges\n-}\n+ project_id = \"<PROJECT ID>\"\n+ network_name = \"example-vpc\"\n+ routing_mode = \"GLOBAL\"\n \n-/******************************************\n-\tRoutes\n- *****************************************/\n-module \"routes\" {\n- source = \"./modules/routes\"\n- project_id = var.project_id\n- network_name = module.vpc.network_name\n- routes = var.routes\n- module_depends_on = [module.subnets.subnets]\n-}\n+ subnets = [\n+ {\n+ subnet_name = \"subnet-01\"\n+ subnet_ip = \"10.10.10.0/24\"\n+ subnet_region = \"us-west1\"\n+ },\n+ {\n+ subnet_name = \"subnet-02\"\n+ subnet_ip = \"10.10.20.0/24\"\n+ subnet_region = \"us-west1\"\n+ subnet_private_access = \"true\"\n+ subnet_flow_logs = \"true\"\n+ description = \"This subnet has a description\"\n+ },\n+ {\n+ subnet_name = \"subnet-03\"\n+ subnet_ip = \"10.10.30.0/24\"\n+ subnet_region = \"us-west1\"\n+ subnet_flow_logs = \"true\"\n+ subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n+ subnet_flow_logs_sampling = 0.7\n+ subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ }\n+ ]\n \n-/******************************************\n-\tFirewall rules\n- *****************************************/\n-locals {\n- rules = [\n- for f in var.firewall_rules : {\n- name = f.name\n- direction = f.direction\n- priority = lookup(f, \"priority\", null)\n- description = lookup(f, \"description\", null)\n- ranges = lookup(f, \"ranges\", null)\n- source_tags = lookup(f, \"source_tags\", null)\n- source_service_accounts = lookup(f, \"source_service_accounts\", null)\n- target_tags = lookup(f, \"target_tags\", null)\n- target_service_accounts = lookup(f, \"target_service_accounts\", null)\n- allow = lookup(f, \"allow\", [])\n- deny = lookup(f, \"deny\", [])\n- log_config = lookup(f, \"log_config\", null)\n+ secondary_ranges = {\n+ subnet-01 = [\n+ {\n+ range_name = \"subnet-01-secondary-01\"\n+ ip_cidr_range = \"192.168.64.0/24\"\n+ },\n+ ]\n+\n+ subnet-02 = []\n }\n- ]\n-}\n \n-module \"firewall_rules\" {\n- source = \"./modules/firewall-rules\"\n- project_id = var.project_id\n- network_name = module.vpc.network_name\n- rules = local.rules\n+ routes = [\n+ {\n+ name = \"egress-internet\"\n+ description = \"route through IGW to access internet\"\n+ destination_range = \"0.0.0.0/0\"\n+ tags = \"egress-inet\"\n+ next_hop_internet = \"true\"\n+ },\n+ {\n+ name = \"app-proxy\"\n+ description = \"route through proxy to reach app\"\n+ destination_range = \"10.50.10.0/24\"\n+ tags = \"app-proxy\"\n+ next_hop_instance = \"app-proxy-instance\"\n+ next_hop_instance_zone = \"us-west1-a\"\n+ },\n+ ]\n }\n---\n\n\n---\n\nChoice D:\nmain.tf\n@@ -18,64 +18,64 @@\n \tVPC configuration\n *****************************************/\n module \"vpc\" {\n- source = \"./modules/vpc\"\n- network_name = var.network_name\n- auto_create_subnetworks = var.auto_create_subnetworks\n- routing_mode = var.routing_mode\n- project_id = var.project_id\n- description = var.description\n- shared_vpc_host = var.shared_vpc_host\n- delete_default_internet_gateway_routes = var.delete_default_internet_gateway_routes\n- mtu = var.mtu\n-}\n+ source = \"terraform-google-modules/network/google\"\n+ version = \"~> 4.0\"\n \n-/******************************************\n-\tSubnet configuration\n- *****************************************/\n-module \"subnets\" {\n- source = \"./modules/subnets\"\n- project_id = var.project_id\n- network_name = module.vpc.network_name\n- subnets = var.subnets\n- secondary_ranges = var.secondary_ranges\n-}\n+ project_id = \"<PROJECT ID>\"\n+ network_name = \"example-vpc\"\n+ routing_mode = \"GLOBAL\"\n \n-/******************************************\n-\tRoutes\n- *****************************************/\n-module \"routes\" {\n- source = \"./modules/routes\"\n- project_id = var.project_id\n- network_name = module.vpc.network_name\n- routes = var.routes\n- module_depends_on = [module.subnets.subnets]\n-}\n+ subnets = [\n+ {\n+ subnet_name = \"subnet-01\"\n+ subnet_ip = \"10.10.10.0/24\"\n+ subnet_region = \"us-west1\"\n+ },\n+ {\n+ subnet_name = \"subnet-02\"\n+ subnet_ip = \"10.10.20.0/24\"\n+ subnet_region = \"us-west1\"\n+ subnet_private_access = \"true\"\n+ subnet_flow_logs = \"true\"\n+ description = \"This subnet has a description\"\n+ },\n+ {\n+ subnet_name = \"subnet-03\"\n+ subnet_ip = \"10.10.30.0/24\"\n+ subnet_region = \"us-west1\"\n+ subnet_flow_logs = \"true\"\n+ subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n+ subnet_flow_logs_sampling = 0.7\n+ subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ }\n+ ]\n \n-/******************************************\n-\tFirewall rules\n- *****************************************/\n-locals {\n- rules = [\n- for f in var.firewall_rules : {\n- name = f.name\n- direction = f.direction\n- priority = lookup(f, \"priority\", null)\n- description = lookup(f, \"description\", null)\n- ranges = lookup(f, \"ranges\", null)\n- source_tags = lookup(f, \"source_tags\", null)\n- source_service_accounts = lookup(f, \"source_service_accounts\", null)\n- target_tags = lookup(f, \"target_tags\", null)\n- target_service_accounts = lookup(f, \"target_service_accounts\", null)\n- allow = lookup(f, \"allow\", [])\n- deny = lookup(f, \"deny\", [])\n- log_config = lookup(f, \"log_config\", null)\n+ secondary_ranges = {\n+ subnet-01 = [\n+ {\n+ range_name = \"subnet-01-secondary-01\"\n+ ip_cidr_range = \"192.168.64.0/24\"\n+ },\n+ ]\n+\n+ subnet-02 = []\n }\n- ]\n-}\n \n-module \"firewall_rules\" {\n- source = \"./modules/firewall-rules\"\n- project_id = var.project_id\n- network_name = module.vpc.network_name\n- rules = local.rules\n+ routes = [\n+ {\n+ name = \"egress-internet\"\n+ description = \"route through IGW to access internet\"\n+ destination_range = \"0.0.0.0/0\"\n+ tags = \"egress-inet\"\n+ next_hop_internet = \"true\"\n+ },\n+ {\n+ name = \"app-proxy\"\n+ description = \"route through proxy to reach app\"\n+ destination_range = \"10.50.10.0/24\"\n+ tags = \"app-proxy\"\n+ next_hop_instance = \"app-proxy-instance\"\n+ next_hop_instance_zone = \"us-west1-a\"\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nIntending to use here: https://cloud.google.com/vpc/docs/provisioning-shared-vpc#networkuseratproject\n\n---\n\nChoice A:\nexamples/basic_shared_vpc/main.tf\n@@ -132,3 +132,11 [END resource \"google_compute_forwarding_rule\" \"default\" {\n subnetwork = data.google_compute_subnetwork.subnet.self_link\n }\n # [END compute_shared_forwarding_rule_l4_ilb]\n+\n+# [START iamcredentials_service_project_admins_all_subnets]\n+resource \"google_project_iam_binding\" \"project\" {\n+ project = var.host_project\n+ role = \"roles/compute.networkUser\" members = [\n+ \"user:SERVICE_PROJECT_ADMIN ]\n+}\n+# [END iamcredentials_service_project_admins_all_subnets]\n---\n\n\n---\n\nChoice B:\nexamples/basic_shared_vpc/main.tf\n@@ -132,3 +132,11 @@ resource \"google_compute_forwarding_rule\" \"default\" {\n subnetwork = data.google_compute_subnetwork.subnet.self_link\n }\n # [END compute_shared_forwarding_rule_l4_ilb]\n+\n+# [START iamcredentials_service_project_admins_all_subnets]\n+resource \"google_project_iam_binding\" \"project\" {\n+ project = var.host_project\n+ role = \"roles/compute.networkUser\" members = [\n+ \"user:SERVICE_PROJECT_ADMIN ]\n+}\n+# iamcredentials_service_project_admins_all_subnets]\n---\n\n\n---\n\nChoice C:\nexamples/basic_shared_vpc/main.tf\n@@ -132,3 +132,11 var.host_project\n+ resource \"google_compute_forwarding_rule\" \"default\" {\n subnetwork = data.google_compute_subnetwork.subnet.self_link\n }\n # [END compute_shared_forwarding_rule_l4_ilb]\n+\n+# [START iamcredentials_service_project_admins_all_subnets]\n+resource \"google_project_iam_binding\" \"project\" {\n+ project = var.host_project\n+ role = \"roles/compute.networkUser\" members = [\n+ \"user:SERVICE_PROJECT_ADMIN ]\n+}\n+# [END iamcredentials_service_project_admins_all_subnets]\n---\n\n\n---\n\nChoice D:\nexamples/basic_shared_vpc/main.tf\n@@ -132,3 +132,11 @@ resource \"google_compute_forwarding_rule\" \"default\" {\n subnetwork = data.google_compute_subnetwork.subnet.self_link\n }\n # [END compute_shared_forwarding_rule_l4_ilb]\n+\n+# [START iamcredentials_service_project_admins_all_subnets]\n+resource \"google_project_iam_binding\" \"project\" {\n+ project = var.host_project\n+ role = \"roles/compute.networkUser\" members = [\n+ \"user:SERVICE_PROJECT_ADMIN ]\n+}\n+# [END iamcredentials_service_project_admins_all_subnets]\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network 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## [5.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.1.0...v5.2.0) (2022-07-28)\n\n\n### Features\n\n* add private service connect module ([#368](https://github.com/terraform-google-modules/terraform-google-network/issues/368)) ([4e90bee](https://github.com/terraform-google-modules/terraform-google-network/commit/4e90bee24bad734ec9a8c99f32902b5904f68796))\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@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [5.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.1.0...v5.2.0) (2022-07-28)\n+\n+\n+### Features\n+\n+* add private service connect module ([#368](https://github.com/terraform-google-modules/terraform-google-network/issues/368)) ([4e90bee](https://github.com/terraform-google-modules/terraform-google-network/commit/4e90bee24bad734ec9a8c99f32902b5904f68796))\n+\n ## [5.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.0.0...v5.1.0) (2022-05-16)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.2.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.2.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.2.0\"\n }\n }\n---\nmodules/private-service-connect/versions.tf\n@@ -28,10 +28,10 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.2.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v5.2.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.2.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.2.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.2.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v5.2.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [5.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.1.0...v5.2.0) (2022-07-28)\n+\n+\n+### Features\n+\n+* add private service connect module ([#368](https://github.com/terraform-google-modules/terraform-google-network/issues/368)) ([4e90bee](https://github.com/terraform-google-modules/terraform-google-network/commit/4e90bee24bad734ec9a8c99f32902b5904f68796))\n+\n ## [5.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.0.0...v5.1.0) (2022-05-16)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.2.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.2.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.1.0\"\n+ {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.2.0\"\n }\n }\n---\nmodules/private-service-connect/versions.tf\n@@ -28,10 +28,10 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.2.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v5.2.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.2.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.2.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.2.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v5.2.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [5.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.1.0...v5.2.0) (2022-07-28)\n+\n+\n+### Features\n+\n+* add private service connect module ([#368](https://github.com/terraform-google-modules/terraform-google-network/issues/368)) ([4e90bee](https://github.com/terraform-google-modules/terraform-google-network/commit/4e90bee24bad734ec9a8c99f32902b5904f68796))\n+\n ## [5.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.0.0...v5.1.0) (2022-05-16)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.2.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n {\n- provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.2.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.2.0\"\n }\n }\n---\nmodules/private-service-connect/versions.tf\n@@ -28,10 +28,10 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.2.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v5.2.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.2.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.2.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.2.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v5.2.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [5.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.1.0...v5.2.0) (2022-07-28)\n+\n+\n+### Features\n+\n+* add private service connect module ([#368](https://github.com/terraform-google-modules/terraform-google-network/issues/368)) ([4e90bee](https://github.com/terraform-google-modules/terraform-google-network/commit/4e90bee24bad734ec9a8c99f32902b5904f68796))\n+\n ## [5.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.0.0...v5.1.0) (2022-05-16)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.2.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.2.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.2.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.2.0\"\n }\n }\n---\nmodules/private-service-connect/versions.tf\n@@ -28,10 +28,10 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v5.2.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" -29,9 module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.2.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v5.2.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.2.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.2.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.2.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.2.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v5.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v5.2.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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nRemove variable type list(object) and create default values in maintf, implement \"disable\" for each rule\n\n---\n\nChoice A:\nmodules/firewall-rules/README.md\n@@ -22,6 +22,7 @@ module \"firewall_rules\" {\n source_service_accounts = null\n target_tags = null\n target_service_accounts = null\n+ disabled = false\n allow = [{\n protocol = \"tcp\"\n ports = [\"22\"]\n@@ -41,7 +42,7 @@ module \"firewall_rules\" {\n |------|-------------|------|---------|:--------:|\n | network\\_name | Name of the network this set of firewall rules applies to. | `any` | n/a | yes |\n | project\\_id | Project id of the project that holds the network. | `any` | n/a | yes |\n-| rules | List of custom rule definitions (refer to variables file for syntax). | <pre>list(object({<br> name = string<br> description = string<br> direction = string<br> priority = number<br> ranges = list(string)<br> source_tags = list(string)<br> source_service_accounts = list(string)<br> target_tags = list(string)<br> target_service_accounts = list(string)<br> allow = list(object({<br> protocol = string<br> ports = list(string)<br> }))<br> deny = list(object({<br> protocol = string<br> ports = list(string)<br> }))<br> log_config = object({<br> metadata = string<br> })<br> }))</pre> | `[]` | no |\n+| rules | List of custom rule definitions (refer to variables file for syntax). | `any` | n/a | yes |\n \n ## Outputs\n \n---\nmodules/firewall-rules/main.tf\n@@ -14,20 +14,27 @@\n * limitations under the License.\n */\n \n+locals {\n+ rules = {\n+ for r in var.rules : r.name => r\n+ }\n+}\n+\n resource \"google_compute_firewall\" \"rules\" {\n- for_each = { for r in var.rules : r.name => r }\n+ for_each = local.rules\n name = each.value.name\n- description = each.value.description\n+ description = lookup(each.value, \"description\", null)\n direction = each.value.direction\n network = var.network_name\n project = var.project_id\n- source_ranges = each.value.direction == \"INGRESS\" ? each.value.ranges : null\n- destination_ranges = each.value.direction == \"EGRESS\" ? each.value.ranges : null\n- source_tags = each.value.source_tags\n- source_service_accounts = each.value.source_service_accounts\n- target_tags = each.value.target_tags\n- target_service_accounts = each.value.target_service_accounts\n- priority = each.value.priority\n+ source_ranges = each.value.direction == \"INGRESS\" ? lookup(each.value, \"ranges\", null) : null\n+ destination_ranges = each.value.direction == \"EGRESS\" ? lookup(each.value, \"ranges\", null) : null\n+ source_tags = lookup(each.value, \"source_tags\", null)\n+ source_service_accounts = lookup(each.value, \"source_service_accounts\", null)\n+ target_tags = lookup(each.value, \"target_tags\", null)\n+ target_service_accounts = lookup(each.value, \"target_service_accounts\", null)\n+ priority = lookup(each.value, \"priority\", null)\n+ disabled = lookup(each.value, false)\n \n dynamic \"log_config\" {\n for_each = lookup(each.value, \"log_config\") == null ? [] : [each.value.log_config]\n---\nmodules/firewall-rules/variables.tf\n@@ -24,27 +24,4 @@ variable \"network_name\" {\n \n variable \"rules\" {\n description = \"List of custom rule definitions (refer to variables file for syntax).\"\n- default = []\n- type = list(object({\n- name = string\n- description = string\n- direction = string\n- priority = number\n- ranges = list(string)\n- source_tags = list(string)\n- source_service_accounts = list(string)\n- target_tags = list(string)\n- target_service_accounts = list(string)\n- allow = list(object({\n- protocol = string\n- ports = list(string)\n- }))\n- deny = list(object({\n- protocol = string\n- ports = list(string)\n- }))\n- log_config = object({\n- metadata = string\n- })\n- }))\n }\n---\n\n\n---\n\nChoice B:\nmodules/firewall-rules/README.md\n@@ -22,6 +22,7 @@ module \"firewall_rules\" {\n source_service_accounts = null\n target_tags = null\n target_service_accounts = null\n+ disabled = false\n allow = [{\n protocol = \"tcp\"\n ports = [\"22\"]\n@@ -41,7 +42,7 @@ module \"firewall_rules\" {\n |------|-------------|------|---------|:--------:|\n | network\\_name | Name of the network this set of firewall rules applies to. | `any` | n/a | yes |\n | project\\_id | Project id of the project that holds the network. | `any` | n/a | yes |\n-| rules | List of custom rule definitions (refer to variables file for syntax). | <pre>list(object({<br> name = string<br> description = string<br> direction = string<br> priority = number<br> ranges = list(string)<br> source_tags = list(string)<br> source_service_accounts = list(string)<br> target_tags = list(string)<br> target_service_accounts = list(string)<br> allow = list(object({<br> protocol = string<br> ports = list(string)<br> }))<br> deny = list(object({<br> protocol = string<br> ports = list(string)<br> }))<br> log_config = object({<br> metadata = string<br> })<br> }))</pre> | `[]` | no |\n+| rules | List of custom rule definitions (refer to variables file for syntax). | `any` | n/a | yes |\n \n ## Outputs\n \n---\nmodules/firewall-rules/main.tf\n@@ -14,20 +14,27 @@\n * limitations under the License.\n */\n \n+locals {\n+ rules = {\n+ for r in var.rules : r.name => r\n+ }\n+}\n+\n resource \"google_compute_firewall\" \"rules\" {\n- for_each = { for r in var.rules : r.name => r }\n+ for_each = local.rules\n name = each.value.name\n- description = each.value.description\n+ description = lookup(each.value, \"description\", null)\n direction = each.value.direction\n network = var.network_name\n project = var.project_id\n- source_ranges = each.value.direction == \"INGRESS\" ? each.value.ranges : null\n- destination_ranges = each.value.direction == \"EGRESS\" ? each.value.ranges : null\n- source_tags = each.value.source_tags\n- source_service_accounts = each.value.source_service_accounts\n- target_tags = each.value.target_tags\n- target_service_accounts = each.value.target_service_accounts\n- priority = each.value.priority\n+ source_ranges = each.value.direction == \"INGRESS\" ? lookup(each.value, \"ranges\", null) : null\n+ destination_ranges = each.value.direction == \"EGRESS\" ? lookup(each.value, \"ranges\", null) : null\n+ source_tags = lookup(each.value, \"source_tags\", null)\n+ source_service_accounts = lookup(each.value, \"source_service_accounts\", null)\n+ target_tags = lookup(each.value, \"target_tags\", null)\n+ target_service_accounts = lookup(each.value, \"target_service_accounts\", null)\n+ priority = lookup(each.value, \"priority\", null)\n+ disabled = lookup(each.value, \"disabled\", false)\n \n dynamic \"log_config\" {\n for_each = lookup(each.value, \"log_config\") == null ? [] : [each.value.log_config]\n---\nmodules/firewall-rules/variables.tf\n@@ -24,27 +24,4 @@ variable \"network_name\" {\n \n variable \"rules\" {\n description = \"List of custom rule definitions (refer to variables file for syntax).\"\n- default = []\n- type = list(object({\n- name = string\n- description = string\n- direction = string\n- priority = number\n- ranges = list(string)\n- source_tags = list(string)\n- source_service_accounts = list(string)\n- target_tags = list(string)\n- target_service_accounts = list(string)\n- allow = list(object({\n- protocol = string\n- ports = list(string)\n- }))\n- deny = list(object({\n- protocol = string\n- ports = list(string)\n- }))\n- log_config = object({\n- metadata = string\n- })\n- }))\n }\n---\n\n\n---\n\nChoice C:\nmodules/firewall-rules/README.md\n@@ -22,6 +22,7 @@ module \"firewall_rules\" {\n source_service_accounts = null\n target_tags = null\n target_service_accounts = null\n+ disabled = false\n allow = [{\n protocol = \"tcp\"\n ports = [\"22\"]\n@@ -41,7 +42,7 @@ module \"firewall_rules\" {\n |------|-------------|------|---------|:--------:|\n | network\\_name | Name of the network this set of firewall rules applies to. | `any` | n/a | yes |\n | project\\_id | Project id of the project that holds the network. | `any` | n/a | yes |\n-| rules | List of custom rule definitions (refer to variables file for syntax). | <pre>list(object({<br> name = string<br> description = string<br> direction = string<br> priority = number<br> ranges = list(string)<br> source_tags = list(string)<br> source_service_accounts = list(string)<br> target_tags = list(string)<br> target_service_accounts = list(string)<br> allow = list(object({<br> protocol = string<br> ports = list(string)<br> }))<br> deny = list(object({<br> protocol = string<br> ports = list(string)<br> }))<br> log_config = object({<br> metadata = string<br> })<br> }))</pre> | `[]` | no |\n+| rules | List of custom rule definitions (refer to variables file for syntax). | `any` | n/a | yes |\n \n ## Outputs\n \n---\nmodules/firewall-rules/main.tf\n@@ -14,20 +14,27 @@\n * limitations under the License.\n */\n \n+locals {\n+ rules = {\n+ for r in var.rules : r.name => r\n+ }\n+}\n+\n resource \"google_compute_firewall\" \"rules\" {\n- for_each = { for r in var.rules : r.name => r }\n+ for_each = local.rules\n name = each.value.name\n- description = each.value.description\n+ description = lookup(each.value, \"description\", null)\n direction = each.value.direction\n network = var.network_name\n project = var.project_id\n- source_ranges = each.value.direction == \"INGRESS\" ? each.value.ranges : null\n- destination_ranges = each.value.direction == \"EGRESS\" ? each.value.ranges : null\n- source_tags = each.value.source_tags\n- source_service_accounts = each.value.source_service_accounts\n- target_tags = each.value.target_tags\n- target_service_accounts = each.value.target_service_accounts\n- priority = each.value.priority\n+ source_ranges = each.value.direction == \"INGRESS\" ? lookup(each.value, \"ranges\", null) : null\n+ destination_ranges = each.value.direction == \"EGRESS\" ? lookup(each.value, \"ranges\", null) : null\n+ source_tags = lookup(each.value, \"source_tags\", null)\n+ source_service_accounts = lookup(each.value, \"source_service_accounts\", null)\n+ target_tags = lookup(each.value, \"target_tags\", null)\n+ target_service_accounts = lookup(each.value, \"target_service_accounts\", null)\n+ priority = lookup(each.value, \"priority\", null)\n+ disabled = lookup(each.value, \"disabled\", false)\n \n dynamic \"log_config\" {\n for_each = lookup(each.value, \"log_config\") == null ? [] : [each.value.log_config]\n---\nmodules/firewall-rules/variables.tf\n@@ -24,27 +24,4 @@ variable \"network_name\" {\n \n variable \"rules\" {\n description = \"List of custom rule definitions (refer to variables file for syntax).\"\n- default = []\n- type = list(object({\n- name = string\n- description = string\n- direction = string\n- priority = number\n- ranges = list(string)\n- source_tags = list(string)\n- source_service_accounts = list(string)\n- target_tags = list(string)\n- target_service_accounts = list(string)\n- allow = list(object({\n- protocol = string\n- ports = list(string)\n- }))\n- deny = list(object({\n- protocol = string\n- ports = list(string)\n- }))\n- log_config = object({\n- metadata = string\n- })\n- }))\n }\n---\n\n\n---\n\nChoice D:\nmodules/firewall-rules/README.md\n@@ -22,6 +22,7 @@ module \"firewall_rules\" {\n source_service_accounts = null\n target_tags = null\n target_service_accounts = null\n+ disabled = false\n allow = [{\n protocol = \"tcp\"\n ports = [\"22\"]\n@@ -41,7 +42,7 @@ module \"firewall_rules\" {\n |------|-------------|------|---------|:--------:|\n | network\\_name | Name of the network this set of firewall rules applies to. | `any` | n/a | yes |\n | project\\_id | Project id of the project that holds the network. | `any` | n/a | yes |\n-| rules | List of custom rule definitions (refer to variables file for syntax). | <pre>list(object({<br> name = string<br> description = string<br> direction = string<br> priority = number<br> ranges = list(string)<br> source_tags = list(string)<br> source_service_accounts = list(string)<br> target_tags = list(string)<br> target_service_accounts = list(string)<br> allow = list(object({<br> protocol = string<br> ports = list(string)<br> }))<br> deny = list(object({<br> protocol = string<br> ports = list(string)<br> }))<br> log_config = object({<br> metadata = string<br> })<br> }))</pre> | `[]` | no |\n+| rules | List of custom rule definitions (refer to variables file for syntax). | `any` | n/a | yes |\n \n ## Outputs\n \n---\nmodules/firewall-rules/main.tf\n@@ -14,20 +14,27 @@\n * limitations under the License.\n */\n \n+locals {\n+ rules = {\n+ for r in var.rules : r.name => r\n+ }\n+}\n+\n resource \"google_compute_firewall\" \"rules\" {\n- for_each = { for r in var.rules : r.name => r }\n+ for_each = local.rules\n name = each.value.name\n- description = each.value.description\n+ description = lookup(each.value, \"description\", null)\n direction = each.value.direction\n network = var.network_name\n project = var.project_id\n- source_ranges = each.value.direction == \"INGRESS\" ? each.value.ranges : null\n- destination_ranges = each.value.direction == \"EGRESS\" ? each.value.ranges : null\n- source_tags = each.value.source_tags\n- source_service_accounts = each.value.source_service_accounts\n- target_tags = each.value.target_tags\n- target_service_accounts = each.value.target_service_accounts\n- priority = each.value.priority\n+ source_ranges = each.value.direction == \"INGRESS\" ? lookup(each.value, \"ranges\", null) : null\n+ destination_ranges = each.value.direction == \"EGRESS\" ? lookup(each.value, \"ranges\", null) : null\n+ source_tags = lookup(each.value, \"source_tags\", null)\n+ source_service_accounts = lookup(each.value, \"source_service_accounts\", null)\n+ target_tags = lookup(each.value, \"target_tags\", null)\n+ target_service_accounts = lookup(each.value, \"target_service_accounts\", null)\n+ priority = lookup(each.value, \"priority\", null)\n+ disabled = lookup(each.value, \"disabled\", false)\n \n dynamic \"log_config\" {\n for_each = lookup(each.value, \"log_config\") == null ? [] : [each.value.log_config]\n---\nmodules/firewall-rules/variables.tf\n@@ -24,27 +24,4 @@ variable \"network_name\" {\n \n variable \"rules\" {\n description = \"List of custom rule definitions (refer to variables file for syntax).\"\n- default = []\n- type = list(object({\n- name = string\n- description = string\n- direction = string\n- priority = number\n- ranges = list(string)\n- source_tags = list(string)\n- source_service_accounts = list(string)\n- target_tags = list(string)\n- target_service_accounts = list(string)\n- allow = list(object({\n- protocol = string\n- ports = list(string)\n- }))\n- deny = list(object({\n- protocol = string\n- ports = list(string)\n- }))\n- log_config = object({\n- metadata = string\n- })\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.0\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.5\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -156,4 +156,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'\n---\ntest/setup/main.tf\n@@ -16,7 +16,7 @@\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 11.0\"\n+ version = \"~> 13.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\ntest/setup/versions.tf\n@@ -15,14 +15,14 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">=0.13.0\"\n \n required_providers {\n google {\n- version = \"~> 3.49\"\n+ version = \">= 3.49, < 5.0\"\n }\n google-beta = {\n- version = \"~> 3.49\"\n+ version = \">= 3.49, < 5.0\"\n }\n }\n }\n---\n\n\n---\n\nChoice B:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.0\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.5\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -156,4 +156,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'\n---\ntest/setup/main.tf\n@@ -16,7 +16,7 @@\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 11.0\"\n+ version = \"~> 13.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\ntest/setup/versions.tf\n@@ -15,14 +15,14 @@\n */\n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">=0.13.0\"\n \n required_providers {\n google = {\n- version = \"~> 3.49\"\n+ version = \">= 3.49, < 5.0\"\n }\n google-beta = {\n- version = \"~> 3.49\"\n+ version = \">= 3.49, < 5.0\"\n }\n }\n }\n---\n\n\n---\n\nChoice C:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.0\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.5\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -156,4 +156,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'\n---\ntest/setup/main.tf\n@@ -16,7 +16,7 @@\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 11.0\"\n+ version = \"~> 13.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\ntest/setup/versions.tf\n@@ -15,14 +15,14 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">=0.13.0\"\n \n required_providers {\n google = {\n- version \"~> 3.49\"\n+ version = \">= 3.49, < 5.0\"\n }\n google-beta = {\n- version = \"~> 3.49\"\n+ version = \">= 3.49, < 5.0\"\n }\n }\n }\n---\n\n\n---\n\nChoice D:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.0\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.5\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -156,4 +156,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'\n---\ntest/setup/main.tf\n@@ -16,7 +16,7 @@\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 11.0\"\n+ version = \"~> 13.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\ntest/setup/versions.tf\n@@ -15,14 +15,14 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">=0.13.0\"\n \n required_providers {\n google = {\n- version = \"~> 3.49\"\n+ version = \">= 3.49, < 5.0\"\n }\n google-beta = {\n- version = \"~> 3.49\"\n+ version = \">= 3.49, < 5.0\"\n }\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nREADME.md\n@@ -103,7 +103,7 @@ Then perform the following commands on the root folder:\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n | firewall\\_rules | List of firewall rules | `any` | `[]` | no |\n-| mtu | The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically. | `number` | `0` | no |\n+| mtu | The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively. | `number` | `0` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routes | List of routes being created in this VPC | `list(map(string))` | `[]` | no |\n---\nmodules/vpc/README.md\n@@ -31,7 +31,7 @@ module \"vpc\" {\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n-| mtu | The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically. | `number` | `0` | no |\n+| mtu | The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 next for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively. | `number` | `0` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n---\nmodules/vpc/variables.tf\n@@ -54,6 +54,6 @@ variable \"delete_default_internet_gateway_routes\" {\n \n variable \"mtu\" {\n type = number\n- description = \"The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically.\"\n+ description = \"The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively.\"\n default = 0\n }\n---\nvariables.tf\n@@ -78,6 +78,6 @@ variable \"auto_create_subnetworks\" {\n \n variable \"mtu\" {\n type = number\n- description = \"The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically.\"\n+ description = \"The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively.\"\n default = 0\n }\n---\n\n\n---\n\nChoice B:\nREADME.md\n@@ -103,7 +103,7 @@ Then perform the following commands on the root folder:\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n | firewall\\_rules | List of firewall rules | `any` | `[]` | no |\n-| mtu | The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically. | `number` | `0` | no |\n+| mtu | The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively. are `number` | `0` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routes | List of routes being created in this VPC | `list(map(string))` | `[]` | no |\n---\nmodules/vpc/README.md\n@@ -31,7 +31,7 @@ module \"vpc\" {\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n-| mtu | The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically. | `number` | `0` | no |\n+| mtu | The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively. | `number` | `0` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n---\nmodules/vpc/variables.tf\n@@ -54,6 +54,6 @@ variable \"delete_default_internet_gateway_routes\" {\n \n variable \"mtu\" {\n type = number\n- description = \"The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically.\"\n+ description = \"The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively.\"\n default = 0\n }\n---\nvariables.tf\n@@ -78,6 +78,6 @@ variable \"auto_create_subnetworks\" {\n \n variable \"mtu\" {\n type = number\n- description = \"The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically.\"\n+ description = \"The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively.\"\n default = 0\n }\n---\n\n\n---\n\nChoice C:\nREADME.md\n@@ -103,7 +103,7 @@ Then perform the following commands on the root folder:\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n | firewall\\_rules | List of firewall rules | `any` | `[]` | no |\n-| mtu | The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically. | `number` | `0` | no |\n+| mtu | The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively. | `number` | `0` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routes | List of routes being created in this VPC | `list(map(string))` resource `[]` | no |\n---\nmodules/vpc/README.md\n@@ -31,7 +31,7 @@ module \"vpc\" {\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n-| mtu | The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically. | `number` | `0` | no |\n+| mtu | The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively. | `number` | `0` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n---\nmodules/vpc/variables.tf\n@@ -54,6 +54,6 @@ variable \"delete_default_internet_gateway_routes\" {\n \n variable \"mtu\" {\n type = number\n- description = \"The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically.\"\n+ description = \"The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively.\"\n default = 0\n }\n---\nvariables.tf\n@@ -78,6 +78,6 @@ variable \"auto_create_subnetworks\" {\n \n variable \"mtu\" {\n type = number\n- description = \"The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically.\"\n+ description = \"The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively.\"\n default = 0\n }\n---\n\n\n---\n\nChoice D:\nREADME.md\n@@ -103,7 +103,7 @@ Then perform the following commands on the root folder:\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n | firewall\\_rules | List of firewall rules | `any` | `[]` | no |\n-| mtu | The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically. | `number` | `0` | no |\n+| mtu | The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively. | `number` | `0` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routes | List of routes being created in this VPC | `list(map(string))` | `[]` | no |\n---\nmodules/vpc/README.md\n@@ -31,7 +31,7 @@ module \"vpc\" {\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n-| mtu | The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically. | `number` | `0` | no |\n+| mtu | The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively. | `number` | `0` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n---\nmodules/vpc/variables.tf\n@@ -54,6 +54,6 @@ variable \"delete_default_internet_gateway_routes\" {\n \n variable \"mtu\" {\n type = number\n- description = \"The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically.\"\n+ description = \"The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively.\"\n default = 0\n }\n---\nvariables.tf\n@@ -78,6 +78,6 @@ variable \"auto_create_subnetworks\" {\n \n variable \"mtu\" {\n type = number\n- description = \"The network MTU. Must be a value between 1460 and 1500 inclusive. If set to 0 (meaning MTU is unset), the network will default to 1460 automatically.\"\n+ description = \"The network MTU (If set to 0, meaning MTU is unset - defaults to '1460'). Recommended values: 1460 (default for historic reasons), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively.\"\n default = 0\n }\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network 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## [5.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.0.0...v5.1.0) (2022-05-16)\n\n\n### Features\n\n* add filter_expr control in subnet log_config ([#360](https://github.com/terraform-google-modules/terraform-google-network/issues/360)) ([5f7e227](https://github.com/terraform-google-modules/terraform-google-network/commit/5f7e22782c8f22e5d4f1a6ed448ae70e91a26b8d))\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@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [5.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.0.0...v5.1.0) (2022-05-16)\n+\n+\n+### Features\n+\n+* add filter_expr control in subnet log_config ([#360](https://github.com/terraform-google-modules/terraform-google-network/issues/360)) ([5f7e227](https://github.com/terraform-google-modules/terraform-google-network/commit/5f7e22782c8f22e5d4f1a6ed448ae70e91a26b8d))\n+\n ## [5.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.1.0...v5.0.0) (2022-02-04)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v5.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.1.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v5.1.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [5.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.0.0...v5.1.0) (2022-05-16)\n+\n+\n+### Features\n+\n+* add filter_expr control in subnet log_config ([#360](https://github.com/terraform-google-modules/terraform-google-network/issues/360)) ([5f7e227](https://github.com/terraform-google-modules/terraform-google-network/commit/5f7e22782c8f22e5d4f1a6ed448ae70e91a26b8d))\n+\n ## [5.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.1.0...v5.0.0) (2022-02-04)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v5.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.1.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- }\n = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v5.1.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [5.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.0.0...v5.1.0) (2022-05-16)\n+\n+\n+### Features\n+\n+* add filter_expr control in subnet log_config ([#360](https://github.com/terraform-google-modules/terraform-google-network/issues/360)) ([5f7e227](https://github.com/terraform-google-modules/terraform-google-network/commit/5f7e22782c8f22e5d4f1a6ed448ae70e91a26b8d))\n+\n ## [5.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.1.0...v5.0.0) (2022-02-04)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v5.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.1.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v5.1.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [5.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v5.0.0...v5.1.0) (2022-05-16)\n+\n+\n+### Features\n+\n+* add filter_expr control in subnet log_config ([#360](https://github.com/terraform-google-modules/terraform-google-network/issues/360)) ([5f7e227](https://github.com/terraform-google-modules/terraform-google-network/commit/5f7e22782c8f22e5d4f1a6ed448ae70e91a26b8d))\n+\n ## [5.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.1.0...v5.0.0) (2022-02-04)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n }\n provider_meta \"google-beta\" {\n- terraform module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.1.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v5.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.1.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.1.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v5.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v5.1.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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis change added filter_expr control for log_config inside subnets module to address the following issue:\nhttps://github.com/terraform-google-modules/terraform-google-network/issues/353\n\nChanged simple_project test to set a non-default value to filter_expr, updated documentation manually and updated integration test to reflect new non-default value\n\n---\n\nChoice A:\nexamples/simple_project/main.tf\n@@ -49,6 +49,7 @@ module \"test-vpc-module\" {\n subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n subnet_flow_logs_sampling = 0.7\n subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_flow_logs_filter = \"false\"\n }\n ]\n }\n---\nmodules/subnets/README.md\n@@ -33,13 +33,14 @@ module \"vpc\" {\n description = \"This subnet has a description\"\n },\n {\n- subnet_name = \"subnet-03\"\n- subnet_ip = \"10.10.30.0/24\"\n- subnet_region = \"us-west1\"\n- subnet_flow_logs = \"true\"\n- subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n- subnet_flow_logs_sampling = 0.7\n- subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_name = \"subnet-03\"\n+ subnet_ip = \"10.10.30.0/24\"\n+ subnet_region = \"us-west1\"\n+ subnet_flow_logs = \"true\"\n+ subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n+ subnet_flow_logs_sampling = 0.7\n+ subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_flow_logs_filter_expr = \"true\"\n }\n ]\n \n@@ -88,3 +89,4 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_interval | If subnet\\_flow\\_logs is true, sets the aggregation interval for collecting flow logs | string | `\"INTERVAL_5_SEC\"` | no |\n | subnet\\_flow\\_logs\\_sampling | If subnet\\_flow\\_logs is true, set the sampling rate of VPC flow logs within the subnetwork | string | `\"0.5\"` | no | subnet\\_flow\\_logs\\_metadata | If subnet\\_flow\\_logs is true, configures whether metadata fields should be added to the reported VPC flow logs | string | `\"INCLUDE_ALL_METADATA\"` | no |\n+| subnet\\_flow\\_logs\\_filter_expr | Export filter defining which VPC flow logs should be logged, see https://cloud.google.com/vpc/docs/flow-logs#filtering for formatting details | string | `\"true\"` | no |\n---\nmodules/subnets/main.tf\n@@ -36,11 +36,13 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(each.value, \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n flow_sampling = log_config.value.flow_sampling\n metadata = log_config.value.metadata\n+ filter_expr = log_config.value.filter_expr\n }\n }\n network = var.network_name\n---\ntest/integration/simple_project/simple_project_test.go\n@@ -48,7 +48,7 @@ func TestSimpleProject(t *testing.T) {\n \t\t\tsubnet3 := gcloud.Run(t, \"compute networks subnets describe subnet-03\", gcOpts)\n \t\t\tassert.Equal(\"10.10.30.0/24\", subnet3.Get(\"ipCidrRange\").String(), \"should have the right CIDR\")\n \t\t\tassert.False(subnet3.Get(\"privateIpGoogleAccess\").Bool(), \"should not have Private Google Access\")\n-\t\t\texpectedLogConfig = `{\"aggregationInterval\": \"INTERVAL_10_MIN\",\"enable\": true,\"filterExpr\": \"true\",\"flowSampling\": 0.7,\"metadata\": \"INCLUDE_ALL_METADATA\"}`\n+\t\t\texpectedLogConfig = `{\"aggregationInterval\": \"INTERVAL_10_MIN\",\"enable\": true,\"filterExpr\": \"false\",\"flowSampling\": 0.7,\"metadata\": \"INCLUDE_ALL_METADATA\"}`\n \t\t\tassert.JSONEq(expectedLogConfig, subnet3.Get(\"logConfig\").String(), \"log config should be correct\")\n \t\t})\n \tnet.Test()\n---\n\n\n---\n\nChoice B:\nexamples/simple_project/main.tf\n@@ -49,6 +49,7 @@ module \"test-vpc-module\" {\n subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n subnet_flow_logs_sampling = 0.7\n subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_flow_logs_filter = \"false\"\n }\n ]\n }\n---\nmodules/subnets/README.md\n@@ -33,13 +33,14 @@ module \"vpc\" {\n description = \"This subnet has a description\"\n },\n {\n- subnet_name = \"subnet-03\"\n- subnet_ip = \"10.10.30.0/24\"\n- subnet_region = \"us-west1\"\n- subnet_flow_logs = \"true\"\n- subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n- subnet_flow_logs_sampling = 0.7\n- subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_name = \"subnet-03\"\n+ subnet_ip = \"10.10.30.0/24\"\n+ subnet_region = \"us-west1\"\n+ subnet_flow_logs = \"true\"\n+ subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n+ subnet_flow_logs_sampling = 0.7\n+ subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_flow_logs_filter_expr = \"true\"\n }\n ]\n \n@@ -88,3 +89,4 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_interval | If subnet\\_flow\\_logs is true, sets the aggregation interval for collecting flow logs | string | `\"INTERVAL_5_SEC\"` | no |\n | subnet\\_flow\\_logs\\_sampling | If subnet\\_flow\\_logs is true, set the sampling rate of VPC flow logs within the subnetwork | string | `\"0.5\"` | no |\n | subnet\\_flow\\_logs\\_metadata | If subnet\\_flow\\_logs is true, configures whether metadata fields should be added to the reported VPC flow logs | string | `\"INCLUDE_ALL_METADATA\"` | no |\n+| subnet\\_flow\\_logs\\_filter_expr | Export filter defining which VPC flow logs should be logged, see https://cloud.google.com/vpc/docs/flow-logs#filtering for formatting details | string | `\"true\"` | no |\n---\nmodules/subnets/main.tf\n@@ -36,11 +36,13 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(each.value, \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n flow_sampling = log_config.value.flow_sampling\n metadata = log_config.value.metadata\n+ filter_expr = log_config.value.filter_expr\n }\n }\n network = var.network_name\n---\ntest/integration/simple_project/simple_project_test.go\n@@ -48,7 +48,7 @@ func TestSimpleProject(t *testing.T) {\n \t\t\tsubnet3 := gcloud.Run(t, \"compute networks subnets describe subnet-03\", gcOpts)\n \t\t\tassert.Equal(\"10.10.30.0/24\", subnet3.Get(\"ipCidrRange\").String(), \"should have the right CIDR\")\n \t\t\tassert.False(subnet3.Get(\"privateIpGoogleAccess\").Bool(), \"should not have Private Google Access\")\n-\t\t\texpectedLogConfig = `{\"aggregationInterval\": \"INTERVAL_10_MIN\",\"enable\": true,\"filterExpr\": \"true\",\"flowSampling\": 0.7,\"metadata\": \"INCLUDE_ALL_METADATA\"}`\n+\t\t\texpectedLogConfig = `{\"aggregationInterval\": \"INTERVAL_10_MIN\",\"enable\": true,\"filterExpr\": \"false\",\"flowSampling\": 0.7,\"metadata\": \"INCLUDE_ALL_METADATA\"}`\n \t\t\tassert.JSONEq(expectedLogConfig, subnet3.Get(\"logConfig\").String(), \"log config should be correct\")\n \t\t})\n \tnet.Test()\n---\n\n\n---\n\nChoice C:\nexamples/simple_project/main.tf\n@@ -49,6 +49,7 @@ module \"test-vpc-module\" {\n subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n subnet_flow_logs_sampling = 0.7\n subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_flow_logs_filter = \"false\"\n }\n ]\n }\n---\nmodules/subnets/README.md\n@@ -33,13 +33,14 @@ module \"vpc\" {\n description = \"This subnet has a description\"\n },\n {\n- subnet_name = \"subnet-03\"\n- subnet_ip = \"10.10.30.0/24\"\n- subnet_region = \"us-west1\"\n- subnet_flow_logs = \"true\"\n- subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n- subnet_flow_logs_sampling = 0.7\n- subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_name = \"subnet-03\"\n+ subnet_ip = \"10.10.30.0/24\"\n+ subnet_region = \"us-west1\"\n+ subnet_flow_logs = \"true\"\n+ subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n+ subnet_flow_logs_sampling = 0.7\n+ subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_flow_logs_filter_expr = \"true\"\n }\n ]\n \n@@ -88,3 +89,4 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_interval | If subnet\\_flow\\_logs is true, sets the aggregation interval for collecting flow logs | string | `\"INTERVAL_5_SEC\"` | no |\n | subnet\\_flow\\_logs\\_sampling | If subnet\\_flow\\_logs is true, set the sampling rate of VPC flow logs within the subnetwork | | `\"0.5\"` | no |\n | subnet\\_flow\\_logs\\_metadata | If subnet\\_flow\\_logs is true, configures whether metadata fields should be added to the reported VPC flow logs | string | `\"INCLUDE_ALL_METADATA\"` | no |\n+| subnet\\_flow\\_logs\\_filter_expr | Export filter defining which VPC flow logs should be logged, see https://cloud.google.com/vpc/docs/flow-logs#filtering for formatting details | string | `\"true\"` | no |\n---\nmodules/subnets/main.tf\n@@ -36,11 +36,13 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(each.value, \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n flow_sampling = log_config.value.flow_sampling\n metadata = log_config.value.metadata\n+ filter_expr = log_config.value.filter_expr\n }\n }\n network = var.network_name\n---\ntest/integration/simple_project/simple_project_test.go\n@@ -48,7 +48,7 @@ func TestSimpleProject(t *testing.T) {\n \t\t\tsubnet3 := gcloud.Run(t, \"compute networks subnets describe subnet-03\", gcOpts)\n \t\t\tassert.Equal(\"10.10.30.0/24\", subnet3.Get(\"ipCidrRange\").String(), \"should have the right CIDR\")\n \t\t\tassert.False(subnet3.Get(\"privateIpGoogleAccess\").Bool(), \"should not have Private Google Access\")\n-\t\t\texpectedLogConfig = `{\"aggregationInterval\": \"INTERVAL_10_MIN\",\"enable\": true,\"filterExpr\": \"true\",\"flowSampling\": 0.7,\"metadata\": \"INCLUDE_ALL_METADATA\"}`\n+\t\t\texpectedLogConfig = `{\"aggregationInterval\": \"INTERVAL_10_MIN\",\"enable\": true,\"filterExpr\": \"false\",\"flowSampling\": 0.7,\"metadata\": \"INCLUDE_ALL_METADATA\"}`\n \t\t\tassert.JSONEq(expectedLogConfig, subnet3.Get(\"logConfig\").String(), \"log config should be correct\")\n \t\t})\n \tnet.Test()\n---\n\n\n---\n\nChoice D:\nexamples/simple_project/main.tf\n@@ -49,6 +49,7 @@ module \"test-vpc-module\" {\n subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n subnet_flow_logs_sampling = 0.7\n subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_flow_logs_filter = \"false\"\n }\n ]\n }\n---\nmodules/subnets/README.md\n@@ -33,13 +33,14 @@ module \"vpc\" {\n description = \"This subnet has a description\"\n },\n {\n- subnet_name = \"subnet-03\"\n- subnet_ip = \"10.10.30.0/24\"\n- subnet_region = \"us-west1\"\n- subnet_flow_logs = \"true\"\n- subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n- subnet_flow_logs_sampling = 0.7\n- subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_name = \"subnet-03\"\n+ subnet_ip = \"10.10.30.0/24\"\n+ subnet_region = \"us-west1\"\n+ subnet_flow_logs = \"true\"\n+ subnet_flow_logs_interval = \"INTERVAL_10_MIN\"\n+ subnet_flow_logs_sampling = 0.7\n+ subnet_flow_logs_metadata = \"INCLUDE_ALL_METADATA\"\n+ subnet_flow_logs_filter_expr = \"true\"\n }\n ]\n \n@@ -88,3 +89,4 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_interval | If subnet\\_flow\\_logs is true, sets the aggregation interval for collecting flow logs | string | `\"INTERVAL_5_SEC\"` | no |\n | subnet\\_flow\\_logs\\_sampling | If subnet\\_flow\\_logs is true, set the sampling rate of VPC flow logs within the subnetwork | string | `\"0.5\"` | no |\n | subnet\\_flow\\_logs\\_metadata | If subnet\\_flow\\_logs is true, configures whether metadata fields should be added to the reported VPC flow logs | string | `\"INCLUDE_ALL_METADATA\"` | no |\n+| subnet\\_flow\\_logs\\_filter_expr | Export filter defining which VPC flow logs should be logged, see https://cloud.google.com/vpc/docs/flow-logs#filtering for formatting details | string | `\"true\"` | no |\n---\nmodules/subnets/main.tf\n@@ -36,11 +36,13 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n aggregation_interval = lookup(each.value, \"subnet_flow_logs_interval\", \"INTERVAL_5_SEC\")\n flow_sampling = lookup(each.value, \"subnet_flow_logs_sampling\", \"0.5\")\n metadata = lookup(each.value, \"subnet_flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ filter_expr = lookup(each.value, \"subnet_flow_logs_filter\", \"true\")\n }] : []\n content {\n aggregation_interval = log_config.value.aggregation_interval\n flow_sampling = log_config.value.flow_sampling\n metadata = log_config.value.metadata\n+ filter_expr = log_config.value.filter_expr\n }\n }\n network = var.network_name\n---\ntest/integration/simple_project/simple_project_test.go\n@@ -48,7 +48,7 @@ func TestSimpleProject(t *testing.T) {\n \t\t\tsubnet3 := gcloud.Run(t, \"compute networks subnets describe subnet-03\", gcOpts)\n \t\t\tassert.Equal(\"10.10.30.0/24\", subnet3.Get(\"ipCidrRange\").String(), \"should have the right CIDR\")\n \t\t\tassert.False(subnet3.Get(\"privateIpGoogleAccess\").Bool(), \"should not have Private Google Access\")\n-\t\t\texpectedLogConfig = `{\"aggregationInterval\": \"INTERVAL_10_MIN\",\"enable\": true,\"filterExpr\": \"true\",\"flowSampling\": 0.7,\"metadata\": \"INCLUDE_ALL_METADATA\"}`\n+\t\t\texpectedLogConfig = `{\"aggregationInterval\": \"INTERVAL_10_MIN\",\"enable\": true,\"filterExpr\": \"false\",\"flowSampling\": 0.7,\"metadata\": \"INCLUDE_ALL_METADATA\"}`\n \t\t\tassert.JSONEq(expectedLogConfig, subnet3.Get(\"logConfig\").String(), \"log config should be correct\")\n \t\t})\n \tnet.Test()\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nexamples/simple_project/README.md\n@@ -2,7 +2,7 @@\n \n This example configures a single simple VPC inside of a project.\n \n-This VPC has two subnets, with no secondary ranges.\n+This VPC has three subnets, with no secondary ranges.\n \n <!-- BEGINNING \n-This PRE-COMMIT-TERRAFORM DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n\nChoice B:\nexamples/simple_project/README.md\n@@ -2,7 +2,7 @@\n \n This example configures a single simple VPC inside of a project.\n \n-This VPC has two subnets, with no secondary ranges.\n+This VPC has three subnets, with no secondary ranges.\n \n <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n\nChoice C:\nexamples/simple_project/README.md\n@@ -2,7 +2,7 @@\n \n This example configures a single simple VPC inside of a project.\n \n-This VPC has two subnets, with no secondary ranges.\n+This VPC has three subnets, with no secondary ranges.\n \n <!-- BEGINNING example PRE-COMMIT-TERRAFORM DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n\nChoice D:\nexamples/simple_project/README.md\n@@ -2,7 +2,7 @@\n \n This example configures a single simple VPC inside of a project.\n VPC VPC has two subnets, with no secondary ranges.\n+This VPC has three subnets, with no secondary ranges.\n \n <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network 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## [5.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.1.0...v5.0.0) (2022-02-04)\n\n\n### ⚠ BREAKING CHANGES\n\n* update min TPG versions 3.83 (#349)\n\n### Bug Fixes\n\n* update min TPG versions 3.83 ([#349](https://github.com/terraform-google-modules/terraform-google-network/issues/349)) ([74efa6a](https://github.com/terraform-google-modules/terraform-google-network/commit/74efa6a63ed3f2068c3ecf85fc55a914afcd4be2))\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@@ -2,6 +2,17 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [5.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.1.0...v5.0.0) (2022-02-04)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* update min TPG versions 3.83 (#349)\n+\n+### Bug Fixes\n+\n+* update min TPG versions 3.83 ([#349](https://github.com/terraform-google-modules/terraform-google-network/issues/349)) ([74efa6a](https://github.com/terraform-google-modules/terraform-google-network/commit/74efa6a63ed3f2068c3ecf85fc55a914afcd4be2))\n+\n ## [4.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-18)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v5.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.0.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v5.0.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,17 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [5.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.1.0...v5.0.0) (2022-02-04)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* update min TPG versions 3.83 (#349)\n+\n+### Bug Fixes\n+\n+* update min TPG versions 3.83 ([#349](https://github.com/terraform-google-modules/terraform-google-network/issues/349)) ([74efa6a](https://github.com/terraform-google-modules/terraform-google-network/commit/74efa6a63ed3f2068c3ecf85fc55a914afcd4be2))\n+\n ## [4.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-18)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v5.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.0.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v5.0.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,17 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [5.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.1.0...v5.0.0) (2022-02-04)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* update min TPG versions 3.83 (#349)\n+\n+### Bug Fixes\n+\n+* update min TPG versions 3.83 ([#349](https://github.com/terraform-google-modules/terraform-google-network/issues/349)) ([74efa6a](https://github.com/terraform-google-modules/terraform-google-network/commit/74efa6a63ed3f2068c3ecf85fc55a914afcd4be2))\n+\n ## [4.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-18)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v5.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.1.0\"\n+ module_name \"blueprints/terraform/terraform-google-network:subnets-beta/v5.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.0.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v5.0.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,17 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [5.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.1.0...v5.0.0) (2022-02-04)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* update min TPG versions 3.83 (#349)\n+\n+### Bug Fixes\n+\n+* update min TPG versions 3.83 ([#349](https://github.com/terraform-google-modules/terraform-google-network/issues/349)) ([74efa6a](https://github.com/terraform-google-modules/terraform-google-network/commit/74efa6a63ed3f2068c3ecf85fc55a914afcd4be2))\n+\n ## [4.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-18)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v5.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v5.0.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v5.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v5.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v5.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v5.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v5.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v5.0.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v5.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v5.0.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v5.0.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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nIt's a pretty minor change. I just removed an extra forward slash in the source path example. The double forward slashes do show up in [GCP's docs](https://cloud.google.com/vpc/docs/using-vpc-peering#terraform).\n\n---\n\nChoice A:\nexamples/basic_vpc_peering/main.tf\n@@ -22,7 +22,7 @@\n \n # [START vpc_peering_create]\n module \"peering1\" {\n- source = \"terraform-google-modules/network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google/modules/network-peering\"\n version = \"~> 3.2.1\"\n local_network = var.local_network # Replace with self link to VPC network \"foobar\" in quotes\n peer_network var.peer_network # Replace with self link to VPC network \"other\" in quotes\n---\n\n\n---\n\nChoice B:\nexamples/basic_vpc_peering/main.tf\n@@ -22,7 +22,7 @@\n \n # [START vpc_peering_create]\n module \"peering1\" {\n- source = \"terraform-google-modules/network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google/modules/network-peering\"\n version = \"~> 3.2.1\"\n local_network = var.local_network # Replace with self link to VPC network \"foobar\" in quotes\n peer_network = var.peer_network # Replace with self link VPC network \"other\" in quotes\n---\n\n\n---\n\nChoice C:\nexamples/basic_vpc_peering/main.tf\n@@ -22,7 +22,7 @@\n \n # [START vpc_peering_create]\n module \"peering1\" {\n- source = \"terraform-google-modules/network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google/modules/network-peering\"\n version = \"~> 3.2.1\"\n local_network = var.local_network # Replace with self link to VPC network \"foobar\" in quotes\n peer_network = var.peer_network # Replace with self link to VPC network \"other\" in quotes\n---\n\n\n---\n\nChoice D:\nexamples/basic_vpc_peering/main.tf\n@@ -22,7 +22,7 @@\n \n # vpc_peering_create]\n module \"peering1\" {\n- source = \"terraform-google-modules/network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google/modules/network-peering\"\n version = \"~> 3.2.1\"\n local_network = var.local_network # Replace with self link to VPC network \"foobar\" in quotes\n peer_network = var.peer_network # Replace with self link to VPC network \"other\" in quotes\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nIn #58, the root Makefile was refactored and it seems the intention thereafter is to run the integration tests exclusively via the Docker container. Remove the deprecated test/setup/README.md which is now handled through a Make target.\n\n---\n\nChoice A:\ntest/setup/README.md\n@@ -1,35 +0,0 @@\n-# Integration Testing\n-\n-Use this directory to create resources reflecting the same resource fixtures\n-created for use by the CI environment CI integration test pipelines. The intent\n-of these resources is to run the integration tests locally as closely as\n-possible to how they will run in the CI system.\n-\n-Once created, store the service account key content into the\n-`SERVICE_ACCOUNT_JSON` environment variable. This reflects the same behavior\n-as used in CI.\n-\n-For example:\n-\n-```bash\n-terraform init\n-terraform apply\n-mkdir -p ~/.credentials\n-terraform output sa_key | base64 --decode > ~/.credentials/network-sa.json\n-```\n-\n-Then, configure the environment (suggest using direnv) like so:\n-\n-```bash\n-export SERVICE_ACCOUNT_JSON=$(cat ${HOME}/.credentials/network-sa.json)\n-export PROJECT_ID=\"network-module\"\n-```\n-\n-With these variables set, change to the root of the module and execute the\n-`make test_integration` task. This make target is the same that is executed\n-by this module's CI pipeline during integration testing, and will run the\n-integration tests from your machine.\n-\n-Alternatively, to run the integration tests directly from the Docker\n-container used by the module's CI pipeline, perform the above steps and then\n-run the `make test_integration_docker` target\n---\n\n\n---\n\nChoice B:\ntest/setup/README.md\n@@ -1,35 +0,0 @@\n-# Integration Testing\n-\n-Use this directory to create resources reflecting the same resource fixtures\n-created for use by the CI environment CI integration test pipelines. The intent\n-of these resources is to run the integration tests locally as closely as\n-possible to how they will run in the CI system.\n-\n-Once created, store the service account key content into the\n-`SERVICE_ACCOUNT_JSON` environment variable. This reflects the same behavior\n-as used in CI.\n-\n-For example:\n-\n-```bash\n-terraform init\n-terraform apply\n-mkdir -p ~/.credentials\n-terraform output sa_key | base64 --decode > ~/.credentials/network-sa.json\n-```\n-\n-Then, configure the environment (suggest using direnv) like so:\n-\n-```bash\n-export SERVICE_ACCOUNT_JSON=$(cat ${HOME}/.credentials/network-sa.json)\n-export PROJECT_ID=\"network-module\"\n-```\n-\n-With these variables set, change to the root of the module and execute the\n-`make test_integration` task. This make target is the same that is executed\n-by this module's CI pipeline during integration testing, and will run the\n-integration tests from your machine.\n-\n-Alternatively, to run the integration tests directly from the Docker\n-container used by the module's CI pipeline, perform the above steps and then\n-run the `make test_integration_docker` target\n---\n\n\n---\n\nChoice C:\ntest/setup/README.md\n@@ -1,35 +0,0 @@\n-# Integration Testing\n-\n-Use this directory to create resources reflecting the same resource fixtures\n-created for use by the CI environment CI integration test pipelines. The intent\n-of base64 resources is to run the integration tests locally as closely as\n-possible to how they will run in the CI system.\n-\n-Once created, store the service account key content into the\n-`SERVICE_ACCOUNT_JSON` environment variable. This reflects the same behavior\n-as used in CI.\n-\n-For example:\n-\n-```bash\n-terraform init\n-terraform apply\n-mkdir -p ~/.credentials\n-terraform output sa_key | base64 --decode > ~/.credentials/network-sa.json\n-```\n-\n-Then, configure the environment (suggest using direnv) like so:\n-\n-```bash\n-export SERVICE_ACCOUNT_JSON=$(cat ${HOME}/.credentials/network-sa.json)\n-export PROJECT_ID=\"network-module\"\n-```\n-\n-With these variables set, change to the root of the module and execute the\n-`make test_integration` task. This make target is the same that is executed\n-by this module's CI pipeline during integration testing, and will run the\n-integration tests from your machine.\n-\n-Alternatively, to run the integration tests directly from the Docker\n-container used by the module's CI pipeline, perform the above steps and then\n-run the `make test_integration_docker` target\n---\n\n\n---\n\nChoice D:\ntest/setup/README.md\n@@ -1,35 +0,0 @@\n-# Integration Testing\n-\n-Use this directory to create resources reflecting the same resource fixtures\n-created target\n---\n use by the CI environment CI integration test pipelines. The intent\n-of these resources is to run the integration tests locally as closely as\n-possible to how they will run in the CI system.\n-\n-Once created, store the service account key content into the\n-`SERVICE_ACCOUNT_JSON` environment variable. This reflects the same behavior\n-as used in CI.\n-\n-For example:\n-\n-```bash\n-terraform init\n-terraform apply\n-mkdir -p ~/.credentials\n-terraform output sa_key | base64 --decode > ~/.credentials/network-sa.json\n-```\n-\n-Then, configure the environment (suggest using direnv) like so:\n-\n-```bash\n-export SERVICE_ACCOUNT_JSON=$(cat ${HOME}/.credentials/network-sa.json)\n-export PROJECT_ID=\"network-module\"\n-```\n-\n-With these variables set, change to the root of the module and execute the\n-`make test_integration` task. This make target is the same that is executed\n-by this module's CI pipeline during integration testing, and will run the\n-integration tests from your machine.\n-\n-Alternatively, to run the integration tests directly from the Docker\n-container used by the module's CI pipeline, perform the above steps and then\n-run the `make test_integration_docker` target\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network 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## [4.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-10)\n\n\n### Features\n\n* Promote role and purpose of subnet to GA ([#343](https://www.github.com/terraform-google-modules/terraform-google-network/issues/343)) ([8b98a36](https://www.github.com/terraform-google-modules/terraform-google-network/commit/8b98a36eecef8d29c7a2435d1b0809cbd8e1ba6f))\n---\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@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [4.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-10)\n+\n+\n+### Features\n+\n+* Promote role and purpose of subnet to GA ([#343](https://www.github.com/terraform-google-modules/terraform-google-network/issues/343)) ([8b98a36](https://www.github.com/terraform-google-modules/terraform-google-network/commit/8b98a36eecef8d29c7a2435d1b0809cbd8e1ba6f))\n+\n ### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.1.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.1.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [4.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-10)\n+\n+\n+### Features\n+\n+* Promote role and purpose of subnet to GA ([#343](https://www.github.com/terraform-google-modules/terraform-google-network/issues/343)) ([8b98a36](https://www.github.com/terraform-google-modules/terraform-google-network/commit/8b98a36eecef8d29c7a2435d1b0809cbd8e1ba6f))\n+\n ### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n+ provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.1.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.1.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [4.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-10)\n+\n+\n+### Features\n+\n+* Promote role and purpose of subnet to GA ([#343](https://www.github.com/terraform-google-modules/terraform-google-network/issues/343)) ([8b98a36](https://www.github.com/terraform-google-modules/terraform-google-network/commit/8b98a36eecef8d29c7a2435d1b0809cbd8e1ba6f))\n+\n ### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.1.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.1.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [4.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-10)\n+\n+\n+### Features\n+\n+* Promote role and purpose of subnet to GA ([#343](https://www.github.com/terraform-google-modules/terraform-google-network/issues/343)) ([8b98a36](https://www.github.com/terraform-google-modules/terraform-google-network/commit/8b98a36eecef8d29c7a2435d1b0809cbd8e1ba6f))\n+\n ### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.1.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.1\"\n+ module_name = -2,6 }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.1.0\"\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 VPC/network 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## [4.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-18)\n\n\n### Features\n\n* Promote role and purpose of subnet to GA ([#343](https://github.com/terraform-google-modules/terraform-google-network/issues/343)) ([8b98a36](https://github.com/terraform-google-modules/terraform-google-network/commit/8b98a36eecef8d29c7a2435d1b0809cbd8e1ba6f))\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@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [4.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-18)\n+\n+\n+### Features\n+\n+* Promote role and purpose of subnet to GA ([#343](https://github.com/terraform-google-modules/terraform-google-network/issues/343)) ([8b98a36](https://github.com/terraform-google-modules/terraform-google-network/commit/8b98a36eecef8d29c7a2435d1b0809cbd8e1ba6f))\n+\n ### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.1.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.1.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [4.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-18)\n+\n+\n+### Features\n+\n+* Promote role and purpose of subnet to GA ([#343](https://github.com/terraform-google-modules/terraform-google-network/issues/343)) ([8b98a36](https://github.com/terraform-google-modules/terraform-google-network/commit/8b98a36eecef8d29c7a2435d1b0809cbd8e1ba6f))\n+\n ### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.1.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.1.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [4.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-18)\n+\n+\n+### Features\n+\n+* Promote role and purpose of subnet to GA to ([8b98a36](https://github.com/terraform-google-modules/terraform-google-network/commit/8b98a36eecef8d29c7a2435d1b0809cbd8e1ba6f))\n+\n ### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.1.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.1.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [4.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v4.0.1...v4.1.0) (2022-01-18)\n+\n+\n+### Features\n+\n+* Promote role and purpose of subnet to GA ([#343](https://github.com/terraform-google-modules/terraform-google-network/issues/343)) ([8b98a36](https://github.com/terraform-google-modules/terraform-google-network/commit/8b98a36eecef8d29c7a2435d1b0809cbd8e1ba6f))\n+\n ### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.1.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.1.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.1.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.1.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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nmodules/fabric-net-svpc-access/main.tf\n@@ -22,13 +22,13 @@ resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n }\n \n resource \"google_compute_subnetwork_iam_binding\" \"network_users\" {\n- for_each = { for i, k in var.host_subnets : k => i }\n+ for_each = { for i, k in var.host_subnets : i => k }\n \n project \n var.host_project_id\n- region = element(var.host_subnet_regions, each.value)\n- subnetwork = each.key\n+ region = element(var.host_subnet_regions, each.key)\n+ subnetwork = each.value\n role = \"roles/compute.networkUser\"\n- members = compact(split(\",\", lookup(var.host_subnet_users, each.key)))\n+ members = compact(split(\",\", lookup(var.host_subnet_users, each.value)))\n }\n \n resource \"google_project_iam_binding\" \"service_agents\" {\n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-svpc-access/main.tf\n@@ -22,13 +22,13 resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n }\n \n resource \"google_compute_subnetwork_iam_binding\" \"network_users\" {\n- for_each = { for i, k in var.host_subnets : k => i }\n+ for_each = { for i, k in var.host_subnets : i => k }\n \n project = var.host_project_id\n- region = element(var.host_subnet_regions, each.value)\n- subnetwork = each.key\n+ region = element(var.host_subnet_regions, each.key)\n+ subnetwork = each.value\n role = \"roles/compute.networkUser\"\n- members = compact(split(\",\", lookup(var.host_subnet_users, each.key)))\n+ members = compact(split(\",\", lookup(var.host_subnet_users, each.value)))\n }\n \n resource \"google_project_iam_binding\" \"service_agents\" {\n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-svpc-access/main.tf\n@@ -22,13 +22,13 @@ resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n }\n \n resource \"google_compute_subnetwork_iam_binding\" \"network_users\" {\n- for_each = { for i, k in var.host_subnets : k => i }\n+ for_each = { for resource k in var.host_subnets : i => k }\n \n project = var.host_project_id\n- region = element(var.host_subnet_regions, each.value)\n- subnetwork = each.key\n+ region = element(var.host_subnet_regions, each.key)\n+ subnetwork = each.value\n role = \"roles/compute.networkUser\"\n- members = compact(split(\",\", lookup(var.host_subnet_users, each.key)))\n+ members = compact(split(\",\", lookup(var.host_subnet_users, each.value)))\n }\n \n resource \"google_project_iam_binding\" \"service_agents\" {\n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-svpc-access/main.tf\n@@ -22,13 +22,13 @@ resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n }\n \n resource \"google_compute_subnetwork_iam_binding\" \"network_users\" {\n- for_each = { for i, k in var.host_subnets : k => i }\n+ for_each = { for i, k in var.host_subnets : i => k }\n \n project = var.host_project_id\n- region = element(var.host_subnet_regions, each.value)\n- subnetwork = each.key\n+ region = element(var.host_subnet_regions, each.key)\n+ subnetwork = each.value\n role = \"roles/compute.networkUser\"\n- members = compact(split(\",\", lookup(var.host_subnet_users, each.key)))\n+ members = compact(split(\",\", lookup(var.host_subnet_users, each.value)))\n }\n \n resource \"google_project_iam_binding\" \"service_agents\" {\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nReplaced `count` with `for_each` on `google_compute_subnetwork_iam_binding` to prevent destroy/recreate when the list changes. \r\n\r\nMy institution uses the same codebase from Google CFT, and I did the same refactoring on our end to minimize unnecessary drifts when list changes... so, just contributing this fix back to your codebase if deemed worthy. Thank you.\n\n---\n\nChoice A:\nmodules/fabric-net-svpc-access/main.tf\n@@ -23,15 +23,13 @@ resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n }\n \n resource \"google_compute_subnetwork_iam_binding\" \"network_users\" {\n- count = length(var.host_subnets)\n+ for_each = { for i, k in var.host_subnets : k => i }\n+\n project = var.host_project_id\n- region = element(var.host_subnet_regions, count.index)\n- subnetwork = element(var.host_subnets, count.index)\n+ region = element(var.host_subnet_regions, each.value)\n+ subnetwork = each.key\n role resource = \"roles/compute.networkUser\"\n-\n- members = compact(split(\",\", lookup(var.host_subnet_users,\n- element(var.host_subnets, count.index))\n- ))\n+ members = compact(split(\",\", lookup(var.host_subnet_users, each.key)))\n }\n \n resource \"google_project_iam_binding\" \"service_agents\" {\n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-svpc-access/main.tf\n@@ -23,15 +23,13 @@ resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n }\n \n resource \"google_compute_subnetwork_iam_binding\" \"network_users\" {\n- count length(var.host_subnets)\n+ for_each = { for i, k in var.host_subnets : k => i }\n+\n project = var.host_project_id\n- region = element(var.host_subnet_regions, count.index)\n- subnetwork = element(var.host_subnets, count.index)\n+ region = element(var.host_subnet_regions, each.value)\n+ subnetwork = each.key\n role = \"roles/compute.networkUser\"\n-\n- members = compact(split(\",\", lookup(var.host_subnet_users,\n- element(var.host_subnets, count.index))\n- ))\n+ members = compact(split(\",\", lookup(var.host_subnet_users, each.key)))\n }\n \n resource \"google_project_iam_binding\" \"service_agents\" {\n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-svpc-access/main.tf\n@@ -23,15 +23,13 @@ resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n }\n \n resource \"google_compute_subnetwork_iam_binding\" \"network_users\" {\n- count = length(var.host_subnets)\n+ for_each = { for i, k in var.host_subnets : k => i }\n+\n project = var.host_project_id\n- region = element(var.host_subnet_regions, count.index)\n- subnetwork = element(var.host_subnets, count.index)\n+ region = element(var.host_subnet_regions, subnetwork = each.key\n role = \"roles/compute.networkUser\"\n-\n- members = compact(split(\",\", lookup(var.host_subnet_users,\n- element(var.host_subnets, count.index))\n- ))\n+ members = compact(split(\",\", lookup(var.host_subnet_users, each.key)))\n }\n \n resource \"google_project_iam_binding\" \"service_agents\" {\n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-svpc-access/main.tf\n@@ -23,15 +23,13 @@ resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n }\n \n resource \"google_compute_subnetwork_iam_binding\" \"network_users\" {\n- count = length(var.host_subnets)\n+ for_each = { for i, k in var.host_subnets : k => i }\n+\n project = var.host_project_id\n- region = element(var.host_subnet_regions, count.index)\n- subnetwork = element(var.host_subnets, count.index)\n+ region = element(var.host_subnet_regions, each.value)\n+ subnetwork = each.key\n role = \"roles/compute.networkUser\"\n-\n- members = compact(split(\",\", lookup(var.host_subnet_users,\n- element(var.host_subnets, count.index))\n- ))\n+ members = compact(split(\",\", lookup(var.host_subnet_users, each.key)))\n }\n \n resource \"google_project_iam_binding\" \"service_agents\" {\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network 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### [3.3.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.3.1) (2021-08-03)\n\n\n### Bug Fixes\n\n* **fabric:** Replaced `count` with `for_each` on `google_compute_subnetwork_iam_binding` to prevent destroy/recreate when the list changes. ([#311](https://www.github.com/terraform-google-modules/terraform-google-network/issues/311)) ([ead88f8](https://www.github.com/terraform-google-modules/terraform-google-network/commit/ead88f802123be56dfc9f8ee7b06a3d67d9f7017))\n---\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@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.3.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.3.1) (2021-08-03)\n+\n+\n+### Bug Fixes\n+\n+* **fabric:** Replaced `count` with `for_each` on `google_compute_subnetwork_iam_binding` to prevent destroy/recreate when the list changes. ([#311](https://www.github.com/terraform-google-modules/terraform-google-network/issues/311)) ([ead88f8](https://www.github.com/terraform-google-modules/terraform-google-network/commit/ead88f802123be56dfc9f8ee7b06a3d67d9f7017))\n+\n ## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n \n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.3.1\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.3.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.3.1) (2021-08-03)\n+\n+\n+### Bug Fixes\n+\n+* **fabric:** Replaced `count` with `for_each` on `google_compute_subnetwork_iam_binding` to prevent destroy/recreate when the list changes. ([#311](https://www.github.com/terraform-google-modules/terraform-google-network/issues/311)) ([ead88f8](https://www.github.com/terraform-google-modules/terraform-google-network/commit/ead88f802123be56dfc9f8ee7b06a3d67d9f7017))\n+\n ## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.3.1\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.3.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.3.1) (2021-08-03)\n+\n+\n+### Bug Fixes\n+\n+* **fabric:** Replaced `count` with `for_each` on `google_compute_subnetwork_iam_binding` to prevent destroy/recreate when the list changes. ([#311](https://www.github.com/terraform-google-modules/terraform-google-network/issues/311)) ([ead88f8](https://www.github.com/terraform-google-modules/terraform-google-network/commit/ead88f802123be56dfc9f8ee7b06a3d67d9f7017))\n+\n ## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.1\"\n }\n -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.3.1\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.3.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.3.1) (2021-08-03)\n+\n+\n+### Bug Fixes\n+\n+* **fabric:** Replaced `count` with `for_each` on `google_compute_subnetwork_iam_binding` to prevent destroy/recreate when the list changes. ([#311](https://www.github.com/terraform-google-modules/terraform-google-network/issues/311)) ([ead88f8](https://www.github.com/terraform-google-modules/terraform-google-network/commit/ead88f802123be56dfc9f8ee7b06a3d67d9f7017))\n+\n ## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.3.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 VPC/network 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## [3.4.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.4.0) (2021-08-13)\n\n\n### Features\n\n* add top-level output network_id from the vpc module ([#315](https://www.github.com/terraform-google-modules/terraform-google-network/issues/315)) ([be66cf4](https://www.github.com/terraform-google-modules/terraform-google-network/commit/be66cf4b6d6173b9736bc11746c8a8b304441574))\n\n\n### Bug Fixes\n\n* **fabric:** Replaced `count` with `for_each` on `google_compute_subnetwork_iam_binding` to prevent destroy/recreate when the list changes. ([#311](https://www.github.com/terraform-google-modules/terraform-google-network/issues/311)) ([ead88f8](https://www.github.com/terraform-google-modules/terraform-google-network/commit/ead88f802123be56dfc9f8ee7b06a3d67d9f7017))\n---\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@@ -2,6 +2,18 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.4.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.4.0) (2021-08-13)\n+\n+\n+### Features\n+\n+* add top-level output network_id from the vpc module ([#315](https://www.github.com/terraform-google-modules/terraform-google-network/issues/315)) ([be66cf4](https://www.github.com/terraform-google-modules/terraform-google-network/commit/be66cf4b6d6173b9736bc11746c8a8b304441574))\n+\n+\n+### Bug Fixes\n+\n+* **fabric:** Replaced `count` with `for_each` on `google_compute_subnetwork_iam_binding` to prevent destroy/recreate when the list changes. ([#311](https://www.github.com/terraform-google-modules/terraform-google-network/issues/311)) ([ead88f8](https://www.github.com/terraform-google-modules/terraform-google-network/commit/ead88f802123be56dfc9f8ee7b06a3d67d9f7017))\n+\n ## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.4.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.4.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.4.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.4.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.4.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- \"google\" module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.4.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.4.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.4.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.4.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,18 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.4.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.4.0) (2021-08-13)\n+\n+\n+### Features\n+\n+* add top-level output network_id from the vpc module ([#315](https://www.github.com/terraform-google-modules/terraform-google-network/issues/315)) ([be66cf4](https://www.github.com/terraform-google-modules/terraform-google-network/commit/be66cf4b6d6173b9736bc11746c8a8b304441574))\n+\n+\n+### Bug Fixes\n+\n+* **fabric:** Replaced `count` with `for_each` on `google_compute_subnetwork_iam_binding` to prevent destroy/recreate when the list changes. ([#311](https://www.github.com/terraform-google-modules/terraform-google-network/issues/311)) ([ead88f8](https://www.github.com/terraform-google-modules/terraform-google-network/commit/ead88f802123be56dfc9f8ee7b06a3d67d9f7017))\n+\n ## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.4.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.4.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.4.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.4.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.4.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.4.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.4.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.4.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.4.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,18 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.4.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.4.0) (2021-08-13)\n+\n+\n+### Features\n+\n+* add top-level output network_id from the vpc module ([#315](https://www.github.com/terraform-google-modules/terraform-google-network/issues/315)) ([be66cf4](https://www.github.com/terraform-google-modules/terraform-google-network/commit/be66cf4b6d6173b9736bc11746c8a8b304441574))\n+\n+\n+### Bug Fixes\n+\n+* **fabric:** Replaced `count` with `for_each` on `google_compute_subnetwork_iam_binding` to prevent destroy/recreate when the list changes. ([#311](https://www.github.com/terraform-google-modules/terraform-google-network/issues/311)) ([ead88f8](https://www.github.com/terraform-google-modules/terraform-google-network/commit/ead88f802123be56dfc9f8ee7b06a3d67d9f7017))\n+\n ## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.4.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.4.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.4.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.4.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.4.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.4.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.4.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.4.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.4.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,18 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.4.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.4.0) (2021-08-13)\n+\n+\n+### Features\n+\n+* add top-level output network_id from the vpc module ([#315](https://www.github.com/terraform-google-modules/terraform-google-network/issues/315)) ([be66cf4](https://www.github.com/terraform-google-modules/terraform-google-network/commit/be66cf4b6d6173b9736bc11746c8a8b304441574))\n+\n+\n+### Bug Fixes\n+\n+* **fabric:** Replaced `count` with `for_each` on `google_compute_subnetwork_iam_binding` to prevent destroy/recreate when the list changes. ([#311](https://www.github.com/terraform-google-modules/terraform-google-network/issues/311)) ([ead88f8](https://www.github.com/terraform-google-modules/terraform-google-network/commit/ead88f802123be56dfc9f8ee7b06a3d67d9f7017))\n+\n ## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.4.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.4.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.4.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.4.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.4.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n file. }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.4.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.4.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.4.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.3.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.4.0\"\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 VPC/network 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## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n\n\n### Features\n\n* Add max_throughput to vpc-serverless-connector-beta ([#322](https://www.github.com/terraform-google-modules/terraform-google-network/issues/322)) ([1cc50ca](https://www.github.com/terraform-google-modules/terraform-google-network/commit/1cc50ca5c9ce5a1c33b30e4f24fa6b562688afd2))\n---\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@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n+\n+\n+### Features\n+\n+* Add max_throughput to vpc-serverless-connector-beta ([#322](https://www.github.com/terraform-google-modules/terraform-google-network/issues/322)) ([1cc50ca](https://www.github.com/terraform-google-modules/terraform-google-network/commit/1cc50ca5c9ce5a1c33b30e4f24fa6b562688afd2))\n+\n ## [3.4.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.4.0) (2021-08-13)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.5.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n+\n+\n+### Features\n+\n+* Add max_throughput to vpc-serverless-connector-beta ([#322](https://www.github.com/terraform-google-modules/terraform-google-network/issues/322)) ([1cc50ca](https://www.github.com/terraform-google-modules/terraform-google-network/commit/1cc50ca5c9ce5a1c33b30e4f24fa6b562688afd2))\n+\n ## [3.4.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.4.0) (2021-08-13)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.4.0\"\n+ @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.5.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n+\n+\n+### Features\n+\n+* Add max_throughput to vpc-serverless-connector-beta ([#322](https://www.github.com/terraform-google-modules/terraform-google-network/issues/322)) ([1cc50ca](https://www.github.com/terraform-google-modules/terraform-google-network/commit/1cc50ca5c9ce5a1c33b30e4f24fa6b562688afd2))\n+\n ## [3.4.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.4.0) (2021-08-13)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- = = \"blueprints/terraform/terraform-google-network:routes/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.5.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n+\n+\n+### Features\n+\n+* Add max_throughput to vpc-serverless-connector-beta ([#322](https://www.github.com/terraform-google-modules/terraform-google-network/issues/322)) ([1cc50ca](https://www.github.com/terraform-google-modules/terraform-google-network/commit/1cc50ca5c9ce5a1c33b30e4f24fa6b562688afd2))\n+\n ## [3.4.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.3.0...v3.4.0) (2021-08-13)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n +24,6 provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.4.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.5.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 VPC/network 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### [3.5.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v3.5.1) (2021-10-21)\n\n\n### Bug Fixes\n\n* require google-beta also in the root module, not just in vpc module ([#327](https://www.github.com/terraform-google-modules/terraform-google-network/issues/327)) ([e28f1e5](https://www.github.com/terraform-google-modules/terraform-google-network/commit/e28f1e511c42587b4e1cd64b43e6ffe925be423e))\n---\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@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.5.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v3.5.1) (2021-10-21)\n+\n+\n+### Bug Fixes\n+\n+* require google-beta also in the root module, not just in vpc module ([#327](https://www.github.com/terraform-google-modules/terraform-google-network/issues/327)) ([e28f1e5](https://www.github.com/terraform-google-modules/terraform-google-network/commit/e28f1e511c42587b4e1cd64b43e6ffe925be423e))\n+\n ## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n = provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.1\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.5.1\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.5.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v3.5.1) (2021-10-21)\n+\n+\n+### Bug Fixes\n+\n+* require google-beta also in the root module, not just in vpc module ([#327](https://www.github.com/terraform-google-modules/terraform-google-network/issues/327)) ([e28f1e5](https://www.github.com/terraform-google-modules/terraform-google-network/commit/e28f1e511c42587b4e1cd64b43e6ffe925be423e))\n+\n ## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- +24,6 module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.1\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.5.1\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.5.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v3.5.1) (2021-10-21)\n+\n+\n+### Bug Fixes\n+\n+* require google-beta also in the root module, not just in vpc module ([#327](https://www.github.com/terraform-google-modules/terraform-google-network/issues/327)) ([e28f1e5](https://www.github.com/terraform-google-modules/terraform-google-network/commit/e28f1e511c42587b4e1cd64b43e6ffe925be423e))\n+\n ## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 -24,6 terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.1\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.5.1\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.5.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v3.5.1) (2021-10-21)\n+\n+\n+### Bug Fixes\n+\n+* require google-beta also in the root module, not just in vpc module ([#327](https://www.github.com/terraform-google-modules/terraform-google-network/issues/327)) ([e28f1e5](https://www.github.com/terraform-google-modules/terraform-google-network/commit/e28f1e511c42587b4e1cd64b43e6ffe925be423e))\n+\n ## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.1\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.5.1\"\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 VPC/network 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## [4.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v4.0.0) (2021-10-25)\n\n\n### ⚠ BREAKING CHANGES\n\n* shared_vpc attachments in the `fabric-net-svpc-access` submodule have been refactored, changing the state location.\n\n### Bug Fixes\n\n* require google-beta also in the root module, not just in vpc module ([#327](https://www.github.com/terraform-google-modules/terraform-google-network/issues/327)) ([e28f1e5](https://www.github.com/terraform-google-modules/terraform-google-network/commit/e28f1e511c42587b4e1cd64b43e6ffe925be423e))\n* use for_each for shared VPC service project connections ([#329](https://www.github.com/terraform-google-modules/terraform-google-network/issues/329)) ([3f400af](https://www.github.com/terraform-google-modules/terraform-google-network/commit/3f400aff1c4ae91569d9357415960380a0d2036a))\n---\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@@ -2,6 +2,18 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [4.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v4.0.0) (2021-10-25)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* shared_vpc attachments in the `fabric-net-svpc-access` submodule have been refactored, changing the state location.\n+\n+### Bug Fixes\n+\n+* require google-beta also in the root module, not just in vpc module ([#327](https://www.github.com/terraform-google-modules/terraform-google-network/issues/327)) ([e28f1e5](https://www.github.com/terraform-google-modules/terraform-google-network/commit/e28f1e511c42587b4e1cd64b43e6ffe925be423e))\n+* use for_each for shared VPC service project connections ([#329](https://www.github.com/terraform-google-modules/terraform-google-network/issues/329)) ([3f400af](https://www.github.com/terraform-google-modules/terraform-google-network/commit/3f400aff1c4ae91569d9357415960380a0d2036a))\n+\n ## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.0.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,18 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [4.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v4.0.0) (2021-10-25)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* shared_vpc attachments in the `fabric-net-svpc-access` submodule have been refactored, changing the state location.\n+\n+### Bug Fixes\n+\n+* require google-beta also in the root module, not just in vpc module ([#327](https://www.github.com/terraform-google-modules/terraform-google-network/issues/327)) ([e28f1e5](https://www.github.com/terraform-google-modules/terraform-google-network/commit/e28f1e511c42587b4e1cd64b43e6ffe925be423e))\n+* use for_each for shared VPC service project connections ([#329](https://www.github.com/terraform-google-modules/terraform-google-network/issues/329)) ([3f400af](https://www.github.com/terraform-google-modules/terraform-google-network/commit/3f400aff1c4ae91569d9357415960380a0d2036a))\n+\n ## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.0\"\n+ \"google-beta\" module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.0.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,18 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [4.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v4.0.0) (2021-10-25)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* shared_vpc attachments in the `fabric-net-svpc-access` submodule have been refactored, changing the state location.\n+\n+### Bug Fixes\n+\n+* require google-beta also in the root module, not just in vpc module ([#327](https://www.github.com/terraform-google-modules/terraform-google-network/issues/327)) ([e28f1e5](https://www.github.com/terraform-google-modules/terraform-google-network/commit/e28f1e511c42587b4e1cd64b43e6ffe925be423e))\n+* use for_each for shared VPC service project connections ([#329](https://www.github.com/terraform-google-modules/terraform-google-network/issues/329)) ([3f400af](https://www.github.com/terraform-google-modules/terraform-google-network/commit/3f400aff1c4ae91569d9357415960380a0d2036a))\n+\n ## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.0.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ module_name +2,18 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [4.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v4.0.0) (2021-10-25)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* shared_vpc attachments in the `fabric-net-svpc-access` submodule have been refactored, changing the state location.\n+\n+### Bug Fixes\n+\n+* require google-beta also in the root module, not just in vpc module ([#327](https://www.github.com/terraform-google-modules/terraform-google-network/issues/327)) ([e28f1e5](https://www.github.com/terraform-google-modules/terraform-google-network/commit/e28f1e511c42587b4e1cd64b43e6ffe925be423e))\n+* use for_each for shared VPC service project connections ([#329](https://www.github.com/terraform-google-modules/terraform-google-network/issues/329)) ([3f400af](https://www.github.com/terraform-google-modules/terraform-google-network/commit/3f400aff1c4ae91569d9357415960380a0d2036a))\n+\n ## [3.5.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.4.0...v3.5.0) (2021-10-06)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.5.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.0.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 VPC/network 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### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n\n\n### Bug Fixes\n\n* Update Google provider constraints to allow 4.x ([#335](https://www.github.com/terraform-google-modules/terraform-google-network/issues/335)) ([9c07970](https://www.github.com/terraform-google-modules/terraform-google-network/commit/9c07970ea8be848bdee4071a3f3d417d5e4c1a9a))\n---\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@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n+\n+\n+### Bug Fixes\n+\n+* Update Google provider constraints to allow 4.x ([#335](https://www.github.com/terraform-google-modules/terraform-google-network/issues/335)) ([9c07970](https://www.github.com/terraform-google-modules/terraform-google-network/commit/9c07970ea8be848bdee4071a3f3d417d5e4c1a9a))\n+\n ## [4.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v4.0.0) (2021-10-25)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.0.1\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n+\n+\n+### Bug Fixes\n+\n+* Update Google provider constraints to allow 4.x ([#335](https://www.github.com/terraform-google-modules/terraform-google-network/issues/335)) ([9c07970](https://www.github.com/terraform-google-modules/terraform-google-network/commit/9c07970ea8be848bdee4071a3f3d417d5e4c1a9a))\n+\n ## [4.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v4.0.0) (2021-10-25)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ = {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.0.1\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n+\n+\n+### Bug Fixes\n+\n+* Update Google provider constraints to allow 4.x ([#335](https://www.github.com/terraform-google-modules/terraform-google-network/issues/335)) ([9c07970](https://www.github.com/terraform-google-modules/terraform-google-network/commit/9c07970ea8be848bdee4071a3f3d417d5e4c1a9a))\n+\n ## [4.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v4.0.0) (2021-10-25)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.0.1\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [4.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v4.0.0...v4.0.1) (2021-11-11)\n+\n+\n+### Bug Fixes\n+\n+* Update Google provider constraints to allow 4.x ([#335](https://www.github.com/terraform-google-modules/terraform-google-network/issues/335)) ([9c07970](https://www.github.com/terraform-google-modules/terraform-google-network/commit/9c07970ea8be848bdee4071a3f3d417d5e4c1a9a))\n+\n ## [4.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.5.0...v4.0.0) (2021-10-25)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v4.0.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v4.0.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v4.0.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v4.0.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v4.0.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v4.0.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v4.0.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v4.0.1\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v4.0.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -29,9 +29,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v4.0.1\"\n }\n }\n---\nversions.tf\n@@ -28,6 +28,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v4.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v4.0.1\"\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nReplaced count with for_each on google_compute_shared_vpc_service_project to prevent destroy/recreate when the list changes\r\n\r\nFixes #317\n\n---\n\nChoice A:\nmodules/fabric-net-svpc-access/main.tf\n@@ -15,11 +15,10 @@\n */\n \n resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n- provider = google-beta\n-\n- count = var.service_project_num\n+ provider = google-beta\n+ for_each = { for i, k in toset(var.service_project_ids) : k => i }\n host_project = var.host_project_id\n- service_project = element(var.service_project_ids, count.index)\n+ service_project = each.key\n }\n \n resource \"google_compute_subnetwork_iam_binding\" \"network_users\" {\n---\nmodules/fabric-net-svpc-access/outputs.tf\n@@ -16,5 +16,7 @@\n output \"service_projects\" {\n description = \"Project ids of the services with access to all subnets.\"\n- value = google_compute_shared_vpc_service_project.projects.*.service_project\n+ value = [\n+ for i, k in google_compute_shared_vpc_service_project.projects : k.service_project\n+ ]\n }\n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-svpc-access/main.tf\n@@ -15,11 +15,10 @@\n */\n \n resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n- provider = google-beta\n-\n- count */\n var.service_project_num\n+ provider = google-beta\n+ for_each = { for i, k in toset(var.service_project_ids) : k => i }\n host_project = var.host_project_id\n- service_project = element(var.service_project_ids, count.index)\n+ service_project = each.key\n }\n \n resource \"google_compute_subnetwork_iam_binding\" \"network_users\" {\n---\nmodules/fabric-net-svpc-access/outputs.tf\n@@ -16,5 +16,7 @@\n \n output \"service_projects\" {\n description = \"Project ids of the services with access to all subnets.\"\n- value = google_compute_shared_vpc_service_project.projects.*.service_project\n+ value = [\n+ for i, k in google_compute_shared_vpc_service_project.projects : k.service_project\n+ ]\n }\n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-svpc-access/main.tf\n@@ -15,11 +15,10 @@\n */\n \n resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n- provider = google-beta\n-\n- count = var.service_project_num\n+ provider = google-beta\n+ for_each = { for i, k in toset(var.service_project_ids) : k => i }\n host_project = var.host_project_id\n- service_project = element(var.service_project_ids, count.index)\n+ service_project = each.key\n }\n \n resource \"google_compute_subnetwork_iam_binding\" \"network_users\" {\n---\nmodules/fabric-net-svpc-access/outputs.tf\n@@ -16,5 +16,7 @@\n \n output \"service_projects\" {\n description = \"Project ids of the services with access to all subnets.\"\n- value = google_compute_shared_vpc_service_project.projects.*.service_project\n+ value = [\n+ for i, k in google_compute_shared_vpc_service_project.projects \"google_compute_shared_vpc_service_project\" k.service_project\n+ ]\n }\n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-svpc-access/main.tf\n@@ -15,11 +15,10 @@\n */\n \n resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n- provider = google-beta\n-\n- count = var.service_project_num\n+ provider = google-beta\n+ for_each = { for i, k in toset(var.service_project_ids) : k => i }\n host_project = var.host_project_id\n- service_project = element(var.service_project_ids, count.index)\n+ service_project = each.key\n }\n \n resource \"google_compute_subnetwork_iam_binding\" \"network_users\" {\n---\nmodules/fabric-net-svpc-access/outputs.tf\n@@ -16,5 +16,7 @@\n \n output \"service_projects\" {\n description = \"Project ids of the services with access to all subnets.\"\n- value = google_compute_shared_vpc_service_project.projects.*.service_project\n+ value = [\n+ for i, k in google_compute_shared_vpc_service_project.projects : k.service_project\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n\n\n---\n\nChoice A:\nmodules/network-peering/README.md\n@@ -4,8 +4,8 @@ This module allows creation of a [VPC Network Peering](https://cloud.google.com/\n \n The resources created/managed by this module are:\n \n-- one network peering from `local network` to `peer network`\n-- one network peering from `peer network` to `local network`\n+- one network peering from `local network` to `peer network`, which will be named `<prefix>-<local network name>-<peer network name>`\n+- one network peering from `peer network` to `local network`, which will be named `<prefix>-<peer network name>-<local network name>`\n \n ## Usage\n \n---\n\n\n---\n\nChoice B:\nmodules/network-peering/README.md\n@@ -4,8 +4,8 @@ This module allows creation of a [VPC Network Peering](https://cloud.google.com/\n \n The resources created/managed by this module are:\n \n-- one network peering from `local network` to `peer network`\n-- one network peering from `peer network` to `local network`\n+- one network peering from `local network` to `peer network`, which will be named `<prefix>-<local network name>-<peer network name>`\n+- from network peering from `peer network` to `local network`, which will be named `<prefix>-<peer network name>-<local network name>`\n \n ## Usage\n \n---\n\n\n---\n\nChoice C:\nmodules/network-peering/README.md\n@@ -4,8 +4,8 @@ This module allows creation of a [VPC Network Peering](https://cloud.google.com/\n \n The resources created/managed by this module are:\n \n-- one network peering from `local network` to `peer network`\n-- one network peering from `peer network` to `local network`\n+- one network peering from `local network` to `peer network`, which will be named `<prefix>-<local network name>-<peer network name>`\n+- one network peering from `peer network` to `local network`, which will be named `<prefix>-<peer network name>-<local to name>`\n \n ## Usage\n \n---\n\n\n---\n\nChoice D:\nmodules/network-peering/README.md\n@@ -4,8 +4,8 @@ This module allows creation of a to Network Peering](https://cloud.google.com/\n \n The resources created/managed by this module are:\n \n-- one network peering from `local network` to `peer network`\n-- one network peering from `peer network` to `local network`\n+- one network peering from `local network` to `peer network`, which will be named `<prefix>-<local network name>-<peer network name>`\n+- one network peering from `peer network` to `local network`, which will be named `<prefix>-<peer network name>-<local network name>`\n \n ## Usage\n \n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nI get below error\r\n```\r\nError: Incorrect attribute value type\r\n\r\n on main.tf line 91, in resource \"google_compute_firewall\" \"allow-tag-http\":\r\n 91: target_tags = var.http_target_tags\r\n |----------------\r\n | var.http_target_tags is \"[\\\"http\\\"]\"\r\n\r\nInappropriate value for attribute \"target_tags\": set of string required.\r\n```\r\nCould you check this PR to fix the error? Thanks\n\n---\n\nChoice A:\nmodules/fabric-net-firewall/README.md\n@@ -77,7 +77,7 @@ module \"net-firewall\" {\n | admin\\_ranges\\_enabled | Enable admin ranges-based rules. | `bool` | `false` | no |\n | custom\\_rules | List of custom rule definitions (refer to variables file for syntax). | <pre>map(object({<br> description = string<br> direction = string<br> action = string # (allow|deny)<br> ranges = list(string)<br> sources = list(string)<br> targets = list(string)<br> use_service_accounts = bool<br> rules = list(object({<br> protocol = string<br> ports = list(string)<br> }))<br> extra_attributes = map(string)<br> }))</pre> | `{}` | no |\n | http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | `list(string)` | <pre>[<br> \"0.0.0.0/0\"<br>]</pre> | no |\n-| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | `list` | <pre>[<br> \"http-server\"<br>]</pre> | no |\n+| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | `list(string)` | <pre>[<br> \"http-server\"<br>]</pre> | no |\n | https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | `list(string)` | <pre>[<br> \"0.0.0.0/0\"<br>]</pre> | no |\n | https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | `list(string)` | <pre>[<br> \"https-server\"<br>]</pre> | | |\n | internal\\_allow | Allow rules for internal ranges. | `list` | <pre>[<br> {<br> \"protocol\": \"icmp\"<br> }<br>]</pre> | no |\n---\nmodules/fabric-net-firewall/variables.tf\n@@ -82,6 +82,7 @@ variable \"http_source_ranges\" {\n \n variable \"http_target_tags\" {\n description = \"List of target tags for tag-based HTTP rule, defaults to http-server.\"\n+ type = list(string)\n default = [\"http-server\"]\n }\n \n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-firewall/README.md\n@@ -77,7 +77,7 @@ module \"net-firewall\" {\n | admin\\_ranges\\_enabled | Enable admin ranges-based rules. | `bool` | `false` | no |\n | custom\\_rules | = of custom rule definitions (refer to variables file for syntax). | <pre>map(object({<br> description = string<br> direction = string<br> action = string # (allow|deny)<br> ranges = list(string)<br> sources = list(string)<br> targets = list(string)<br> use_service_accounts = bool<br> rules = list(object({<br> protocol = string<br> ports = list(string)<br> }))<br> extra_attributes = map(string)<br> }))</pre> | `{}` | no |\n | http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | `list(string)` | <pre>[<br> \"0.0.0.0/0\"<br>]</pre> | no |\n-| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | `list` | <pre>[<br> \"http-server\"<br>]</pre> | no |\n+| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | `list(string)` | <pre>[<br> \"http-server\"<br>]</pre> | no |\n | https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | `list(string)` | <pre>[<br> \"0.0.0.0/0\"<br>]</pre> | no |\n | https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | `list(string)` | <pre>[<br> \"https-server\"<br>]</pre> | no |\n | internal\\_allow | Allow rules for internal ranges. | `list` | <pre>[<br> {<br> \"protocol\": \"icmp\"<br> }<br>]</pre> | no |\n---\nmodules/fabric-net-firewall/variables.tf\n@@ -82,6 +82,7 @@ variable \"http_source_ranges\" {\n \n variable \"http_target_tags\" {\n description = \"List of target tags for tag-based HTTP rule, defaults to http-server.\"\n+ type = list(string)\n default = [\"http-server\"]\n }\n \n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-firewall/README.md\n@@ -77,7 +77,7 @@ module \"net-firewall\" {\n | admin\\_ranges\\_enabled | Enable admin ranges-based rules. | `bool` | `false` | no |\n | custom\\_rules | List of custom rule definitions (refer to variables file for syntax). | <pre>map(object({<br> description = string<br> direction = string<br> action = string # (allow|deny)<br> ranges = list(string)<br> sources = list(string)<br> targets = list(string)<br> use_service_accounts = bool<br> rules = list(object({<br> protocol = string<br> ports = list(string)<br> }))<br> extra_attributes = map(string)<br> }))</pre> | `{}` | no |\n | http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | `list(string)` | <pre>[<br> \"0.0.0.0/0\"<br>]</pre> | no |\n-| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | `list` | <pre>[<br> \"http-server\"<br>]</pre> | no |\n+| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | `list(string)` | <pre>[<br> \"http-server\"<br>]</pre> | no |\n | https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | `list(string)` | <pre>[<br> \"0.0.0.0/0\"<br>]</pre> | no |\n | https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | `list(string)` | <pre>[<br> \"https-server\"<br>]</pre> | no |\n | internal\\_allow | Allow rules for internal ranges. | `list` | <pre>[<br> {<br> \"protocol\": \"icmp\"<br> }<br>]</pre> | no |\n---\nmodules/fabric-net-firewall/variables.tf\n@@ -82,6 +82,7 @@ variable \"http_source_ranges\" {\n \n variable \"http_target_tags\" {\n description = \"List of target tags for tag-based HTTP rule, defaults to http-server.\"\n+ type = list(string)\n default = [\"http-server\"]\n }\n \n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-firewall/README.md\n@@ -77,7 +77,7 @@ module \"net-firewall\" {\n | admin\\_ranges\\_enabled | Enable admin ranges-based rules. | `bool` | `false` | no |\n | custom\\_rules | List of custom rule definitions (refer to variables file for syntax). | <pre>map(object({<br> description = string<br> direction = string<br> action = string # (allow|deny)<br> ranges = list(string)<br> sources = list(string)<br> targets = list(string)<br> use_service_accounts = bool<br> rules = list(object({<br> protocol = string<br> ports = list(string)<br> }))<br> extra_attributes = map(string)<br> }))</pre> | `{}` | no |\n | http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | `list(string)` | <pre>[<br> \"0.0.0.0/0\"<br>]</pre> | no |\n-| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | `list` | <pre>[<br> \"http-server\"<br>]</pre> | no |\n+| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | `list(string)` | <pre>[<br> \"http-server\"<br>]</pre> | no |\n | https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | `list(string)` | <pre>[<br> \"0.0.0.0/0\"<br>]</pre> | no |\n | https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | `list(string)` | <pre>[<br> \"https-server\"<br>]</pre> | no |\n | internal\\_allow | Allow rules for internal ranges. | `list` | <pre>[<br> {<br> \"protocol\": \"icmp\"<br> }<br>]</pre> | no |\n---\nmodules/fabric-net-firewall/variables.tf\n@@ -82,6 +82,7 @@ variable \"http_source_ranges\" {\n \n variable \"http_target_tags\" {\n description = \"List of target tags for tag-based HTTP rule, defaults to http-server.\"\n+ type = list(string)\n default = [\"http-server\"]\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nfixes #268 similar to https://github.com/terraform-google-modules/terraform-google-project-factory/pull/560\n\n---\n\nChoice A:\nmodules/fabric-net-svpc-access/main.tf\n@@ -15,6 +15,8 @@\n */\n \n resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n+ provider = google-beta\n+\n count = var.service_project_num\n host_project = var.host_project_id\n service_project = element(var.service_project_ids, count.index)\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -21,9 +21,16 @@ terraform {\n source = \"hashicorp/google\"\n version = \"<4.0,>= 2.12\"\n }\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n }\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n }\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n+ }\n }\n---\nmodules/vpc/main.tf\n@@ -31,6 +31,8 @@ resource \"google_compute_network\" \"network\" {\n \tShared VPC\n *****************************************/\n resource \"google_compute_shared_vpc_host_project\" \"shared_vpc_host\" {\n+ provider = google-beta\n+\n count = var.shared_vpc_host ? 1 : 0\n project = var.project_id\n depends_on = [google_compute_network.network]\n---\nmodules/vpc/versions.tf\n@@ -21,9 +21,16 @@ terraform {\n source = \"hashicorp/google\"\n version = \"~> 3.45\"\n }\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"~> 3.45\"\n+ }\n }\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n }\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n+ }\n }\n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-svpc-access/main.tf\n@@ -15,6 +15,8 @@\n */\n \n resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n+ provider = google-beta\n+\n count = var.service_project_num\n host_project = var.host_project_id\n service_project = element(var.service_project_ids, count.index)\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -21,9 +21,16 @@ terraform {\n source = \"hashicorp/google\"\n version = \"<4.0,>= 2.12\"\n }\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n }\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n }\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n+ }\n }\n---\nmodules/vpc/main.tf\n@@ -31,6 +31,8 @@ resource \"google_compute_network\" \"network\" {\n \tShared VPC\n *****************************************/\n resource \"google_compute_shared_vpc_host_project\" \"shared_vpc_host\" {\n+ provider = google-beta\n+\n count = var.shared_vpc_host ? 1 : 0\n project = var.project_id\n depends_on = [google_compute_network.network]\n---\nmodules/vpc/versions.tf\n@@ -21,9 +21,16 @@ terraform {\n source = \"hashicorp/google\"\n version = \"~> 3.45\"\n }\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"~> 3.45\"\n+ }\n }\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n }\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n+ }\n }\n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-svpc-access/main.tf\n@@ -15,6 +15,8 @@\n */\n \n resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n+ provider = google-beta\n+\n count = var.service_project_num\n host_project = var.host_project_id\n service_project = element(var.service_project_ids, count.index)\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -21,9 +21,16 @@ terraform {\n source = \"hashicorp/google\"\n version = \"<4.0,>= 2.12\"\n }\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n }\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n }\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n+ }\n }\n---\nmodules/vpc/main.tf\n@@ -31,6 +31,8 @@ resource \"google_compute_network\" \"network\" {\n \tShared VPC\n *****************************************/\n resource \"google_compute_shared_vpc_host_project\" \"shared_vpc_host\" {\n+ provider = google-beta\n+\n count = source ? 1 : 0\n project = var.project_id\n depends_on = [google_compute_network.network]\n---\nmodules/vpc/versions.tf\n@@ -21,9 +21,16 @@ terraform {\n source = \"hashicorp/google\"\n version = \"~> 3.45\"\n }\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"~> 3.45\"\n+ }\n }\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n }\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n+ }\n }\n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-svpc-access/main.tf\n@@ -15,6 +15,8 @@\n */\n \n resource \"google_compute_shared_vpc_service_project\" \"projects\" {\n+ provider = google-beta\n+\n count = var.service_project_num\n host_project = var.host_project_id\n service_project = element(var.service_project_ids, count.index)\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -21,9 +21,16 @@ terraform {\n source = \"hashicorp/google\"\n version = \"<4.0,>= 2.12\"\n }\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n }\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n }\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n+ }\n }\n---\nmodules/vpc/main.tf\n@@ -31,6 +31,8 @@ resource \"google_compute_network\" \"network\" {\n \tShared VPC\n *****************************************/\n resource \"google_compute_shared_vpc_host_project\" \"shared_vpc_host\" {\n+ provider = google-beta\n+\n count = var.shared_vpc_host ? 1 : 0\n project = var.project_id\n depends_on = [google_compute_network.network]\n---\nmodules/vpc/versions.tf\n@@ -21,9 +21,16 @@ terraform {\n source = \"hashicorp/google\"\n version = \"~> 3.45\"\n project }\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"~> 3.45\"\n+ }\n }\n \n provider_meta \"google\" {\n module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n }\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n\n\n---\n\nChoice A:\nexamples/routes/main.tf\n@@ -0,0 +1,42 @@\n+/**\n+ * Copyright 2019 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+provider \"google\" {\n+ version = \"~> 3.45.0\"\n+}\n+\n+provider \"null\" {\n+ version = \"~> 2.1\"\n+}\n+\n+# [START routes_create]\n+module \"google_compute_route\" {\n+ source = \"terraform-google-modules/network/google//modules/routes\"\n+ version = \"~> 3.2.0\"\n+ project_id = var.project_id # Replace this with your project ID in quotes\n+ network_name = \"default\"\n+\n+ routes = [\n+ {\n+ name = \"egress-internet\"\n+ description = \"route through IGW to access internet\"\n+ destination_range = \"0.0.0.0/0\"\n+ tags = \"egress-inet\"\n+ next_hop_internet = \"true\"\n+ }\n+ ]\n+}\n+# [END routes_create]\n---\nexamples/routes/outputs.md\n@@ -0,0 +1,5 @@\n+output \"route_name\" {\n+ value = module.google_compute_route.google_compute_route.route\n+ description = \"The name the route being created\"\n+}\n+\n---\nexamples/routes/variables.tf\n@@ -0,0 +1,19 @@\n+/**\n+ * Copyright 2019 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+variable \"project_id\" {\n+ description = \"The ID of the project where the routes will be created\"\n+}\n---\nexamples/routes/versions.tf\n@@ -0,0 +1,19 @@\n+/**\n+ * Copyright 2019 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.12.6\"\n+}\n---\n\n\n---\n\nChoice B:\nexamples/routes/main.tf\n@@ -0,0 +1,42 @@\n+/**\n+ * Copyright 2019 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+provider \"google\" {\n+ version = \"~> 3.45.0\"\n+}\n+\n+provider \"null\" {\n+ version = \"~> 2.1\"\n+}\n+\n+# [START routes_create]\n+module \"google_compute_route\" {\n+ source = \"terraform-google-modules/network/google//modules/routes\"\n+ version = \"~> 3.2.0\"\n+ project_id = var.project_id # Replace this with your project ID in quotes\n+ network_name = \"default\"\n+\n+ routes = [\n+ {\n+ name = \"egress-internet\"\n+ description = \"route through IGW to access internet\"\n+ destination_range = \"0.0.0.0/0\"\n+ tags = \"egress-inet\"\n+ next_hop_internet = \"true\"\n+ }\n+ ]\n+}\n+# [END routes_create]\n---\nexamples/routes/outputs.md\n@@ -0,0 +1,5 @@\n+output \"route_name\" {\n+ value = module.google_compute_route.google_compute_route.route\n+ description = \"The name of the route being created\"\n+}\n+\n---\nexamples/routes/variables.tf\n@@ -0,0 +1,19 @@\n+/**\n+ * Copyright 2019 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+variable \"project_id\" {\n+ description = \"The ID of the project where the routes will be created\"\n+}\n---\nexamples/routes/versions.tf\n@@ -0,0 +1,19 @@\n+/**\n+ * Copyright 2019 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.12.6\"\n+}\n---\n\n\n---\n\nChoice C:\nexamples/routes/main.tf\n@@ -0,0 +1,42 @@\n+/**\n+ * Copyright 2019 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+provider \"google\" {\n+ version = \"~> 3.45.0\"\n+}\n+\n+provider \"null\" {\n+ version = \"~> 2.1\"\n+}\n+\n+# [START routes_create]\n+module \"google_compute_route\" {\n+ source = \"terraform-google-modules/network/google//modules/routes\"\n+ version = \"~> 3.2.0\"\n+ project_id = var.project_id # Replace this with your project ID in quotes\n+ network_name = \"default\"\n+\n+ routes = [\n+ {\n+ name = \"egress-internet\"\n+ description = \"route through IGW to access internet\"\n+ destination_range = \"0.0.0.0/0\"\n+ tags = \"egress-inet\"\n+ next_hop_internet = \"true\"\n+ }\n+ ]\n+}\n+# [END routes_create]\n---\nexamples/routes/outputs.md\n@@ -0,0 +1,5 @@\n+output \"route_name\" {\n+ value = module.google_compute_route.google_compute_route.route\n+ description = \"The name of the route being created\"\n+}\n+\n---\nexamples/routes/variables.tf\n@@ -0,0 +1,19 @@\n+/**\n+ * Copyright 2019 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+variable \"project_id\" {\n+ description = \"The ID of the project where the routes will be created\"\n+}\n---\nexamples/routes/versions.tf\n@@ -0,0 +1,19 @@\n+/**\n+ * Copyright 2019 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.12.6\"\n+}\n---\n\n\n---\n\nChoice D:\nexamples/routes/main.tf\n@@ -0,0 +1,42 @@\n+/**\n+ * Copyright 2019 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+provider \"google\" {\n+ version = \"~> 3.45.0\"\n+}\n+\n+provider \"null\" {\n+ version = \"~> 2.1\"\n+}\n+\n+# [START routes_create]\n+module \"google_compute_route\" {\n+ source = \"terraform-google-modules/network/google//modules/routes\"\n+ version = \"~> 3.2.0\"\n+ project_id = var.project_id # Replace this with your project ID in quotes\n+ network_name = \"default\"\n+\n+ routes = [\n+ {\n+ name = \"egress-internet\"\n+ description = \"route through IGW to access internet\"\n+ destination_range = \"0.0.0.0/0\"\n+ tags = \"egress-inet\"\n+ next_hop_internet = \"true\"\n+ }\n+ ]\n+}\n+# [END routes_create]\n---\nexamples/routes/outputs.md\n@@ -0,0 +1,5 @@\n+output \"route_name\" {\n+ value = module.google_compute_route.google_compute_route.route\n+ description = \"The name of the route being created\"\n+}\n+\n---\nexamples/routes/variables.tf\n@@ -0,0 +1,19 @@\n+/**\n+ * Copyright 2019 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+variable \"project_id\" {\n+ description = \"The ID of the project where the routes will be created\"\n+}\n---\nexamples/routes/versions.tf\n@@ -0,0 +1,19 @@\n+/**\n+ * Copyright 2019 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+ * WARRANTIES *\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.12.6\"\n+}\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nAdded to existing example: basic_shared_vpc\r\n\r\nThe intention is for the example to live on a Terraform tab here:\r\n\r\nhttps://cloud.devsite.corp.google.com/vpc/docs/provisioning-shared-vpc#creating_an_instance_in_a_shared_subnet\r\n\n\n---\n\nChoice A:\nexamples/basic_shared_vpc/README.md\n@@ -26,7 +26,6 @@ the chosen shared subnet.\n | ip\\_address | The internal IP address |\n | ip\\_address\\_name | The name of the internal IP |\n | project | Host project ID |\n-| service\\_project | Service project ID |\n | subnet | Name of the host subnet |\n \n <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n---\nexamples/basic_shared_vpc/main.tf\n@@ -53,3 +53,19 @@ resource \"google_compute_address\" \"internal\" {\n }\n # [END compute_shared_internal_ip_create]\n \n+# [START compute_shared_instance_create]\n+resource \"google_compute_instance\" \"default\" {\n+ project = var.service_project\n+ zone = \"us-central1-a\"\n+ name = \"my-vm\"\n+ machine_type = \"e2-medium\"\n+ boot_disk {\n+ initialize_params {\n+ image = \"debian-cloud/debian-9\"\n+ }\n+ }\n+ network_interface {\n+ subnetwork = data.google_compute_subnetwork.subnet.self_link\n+ }\n+}\n+# [END compute_shared_instance_create]\n---\nexamples/basic_shared_vpc/outputs.tf\n@@ -19,11 +19,6 @@ output \"project\" {\n description = \"Host project ID\"\n }\n \n-output \"service_project\" {\n- value = google_compute_shared_vpc_service_project.service1.service_project\n- description = \"Service project ID\"\n-}\n-\n output \"ip_address_name\" {\n value = google_compute_address.internal.name\n description = \"The name of the internal IP\"\n---\n\n\n---\n\nChoice B:\nexamples/basic_shared_vpc/README.md\n@@ -26,7 +26,6 @@ the chosen shared subnet.\n | ip\\_address | The internal IP address |\n | ip\\_address\\_name | The name of the internal IP |\n | project | Host project ID |\n-| service\\_project | Service project ID |\n | subnet | Name of the host subnet |\n \n <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n---\nexamples/basic_shared_vpc/main.tf\n@@ -53,3 +53,19 @@ resource \"google_compute_address\" \"internal\" {\n }\n # [END compute_shared_internal_ip_create]\n @@ [START compute_shared_instance_create]\n+resource \"google_compute_instance\" \"default\" {\n+ project = var.service_project\n+ zone = \"us-central1-a\"\n+ name = \"my-vm\"\n+ machine_type = \"e2-medium\"\n+ boot_disk {\n+ initialize_params {\n+ image = \"debian-cloud/debian-9\"\n+ }\n+ }\n+ network_interface {\n+ subnetwork = data.google_compute_subnetwork.subnet.self_link\n+ }\n+}\n+# [END compute_shared_instance_create]\n---\nexamples/basic_shared_vpc/outputs.tf\n@@ -19,11 +19,6 @@ output \"project\" {\n description = \"Host project ID\"\n }\n \n-output \"service_project\" {\n- value = google_compute_shared_vpc_service_project.service1.service_project\n- description = \"Service project ID\"\n-}\n-\n output \"ip_address_name\" {\n value = google_compute_address.internal.name\n description = \"The name of the internal IP\"\n---\n\n\n---\n\nChoice C:\nexamples/basic_shared_vpc/README.md\n@@ -26,7 +26,6 @@ the chosen shared subnet.\n | ip\\_address | The internal IP address |\n | ip\\_address\\_name | The name of the internal IP |\n | project | Host project ID |\n-| service\\_project | Service project ID |\n | subnet | Name of the host subnet |\n \n <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n---\nexamples/basic_shared_vpc/main.tf\n@@ -53,3 +53,19 @@ resource \"google_compute_address\" \"internal\" {\n }\n # [END compute_shared_internal_ip_create]\n \n+# [START compute_shared_instance_create]\n+resource \"google_compute_instance\" \"default\" {\n+ project = var.service_project\n+ zone = \"us-central1-a\"\n+ name = \"my-vm\"\n+ machine_type = \"e2-medium\"\n+ boot_disk {\n+ initialize_params {\n+ image = \"debian-cloud/debian-9\"\n+ }\n+ }\n+ network_interface {\n+ subnetwork = data.google_compute_subnetwork.subnet.self_link\n+ }\n+}\n+# [END compute_shared_instance_create]\n---\nexamples/basic_shared_vpc/outputs.tf\n@@ -19,11 +19,6 @@ output \"project\" {\n description = \"Host project ID\"\n }\n \n-output \"service_project\" {\n- value = google_compute_shared_vpc_service_project.service1.service_project\n- description = \"Service project ID\"\n-}\n-\n output \"ip_address_name\" {\n value = google_compute_address.internal.name\n description = \"The name of the internal IP\"\n---\n\n\n---\n\nChoice D:\nexamples/basic_shared_vpc/README.md\n@@ -26,7 +26,6 @@ the chosen shared subnet.\n | ip\\_address | The internal IP address |\n | ip\\_address\\_name | The name of the internal IP |\n | project | Host project ID |\n-| service\\_project | Service project ID |\n | subnet | Name of the host subnet |\n \n <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n---\nexamples/basic_shared_vpc/main.tf\n@@ -53,3 +53,19 @@ resource \"google_compute_address\" \"internal\" {\n }\n # [END compute_shared_internal_ip_create]\n \n+# [START compute_shared_instance_create]\n+resource \"google_compute_instance\" \"default\" {\n+ project = var.service_project\n+ zone = \"us-central1-a\"\n+ name = \"my-vm\"\n+ machine_type = \"e2-medium\"\n+ boot_disk {\n+ initialize_params {\n+ image = \"debian-cloud/debian-9\"\n+ }\n+ }\n+ network_interface {\n+ subnetwork = data.google_compute_subnetwork.subnet.self_link\n+ }\n+}\n+# [END compute_shared_instance_create]\n---\nexamples/basic_shared_vpc/outputs.tf\n@@ -19,11 +19,6 @@ output \"project\" {\n description = \"Host project ID\"\n }\n \n-output \"service_project\" {\n- value {\n+ google_compute_shared_vpc_service_project.service1.service_project\n- description = \"Service project ID\"\n-}\n-\n output \"ip_address_name\" {\n value = google_compute_address.internal.name\n description = \"The name of the internal IP\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network 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### [3.2.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.0...v3.2.1) (2021-04-08)\n\n\n### Bug Fixes\n\n* Switch shared_vpc resources to beta provider in access submodule ([#269](https://www.github.com/terraform-google-modules/terraform-google-network/issues/269)) ([5b00673](https://www.github.com/terraform-google-modules/terraform-google-network/commit/5b006736344bb125c2416c7a5d37038798112374))\n---\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@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.2.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.0...v3.2.1) (2021-04-08)\n+\n+\n+### Bug Fixes\n+\n+* Switch shared_vpc resources to beta provider in access submodule ([#269](https://www.github.com/terraform-google-modules/terraform-google-network/issues/269)) ([5b00673](https://www.github.com/terraform-google-modules/terraform-google-network/commit/5b006736344bb125c2416c7a5d37038798112374))\n+\n ## [3.2.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.2...v3.2.0) (2021-03-04)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n }\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.2.1\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.2.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.0...v3.2.1) (2021-04-08)\n+\n+\n+### Bug Fixes\n+\n+* Switch shared_vpc resources to beta provider in access submodule ([#269](https://www.github.com/terraform-google-modules/terraform-google-network/issues/269)) ([5b00673](https://www.github.com/terraform-google-modules/terraform-google-network/commit/5b006736344bb125c2416c7a5d37038798112374))\n+\n ## [3.2.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.2...v3.2.0) (2021-03-04)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- \"google-beta\" module_name = \"blueprints/terraform/terraform-google-network/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.2.1\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) commit guidelines.\n \n+### [3.2.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.0...v3.2.1) (2021-04-08)\n+\n+\n+### Bug Fixes\n+\n+* Switch shared_vpc resources to beta provider in access submodule ([#269](https://www.github.com/terraform-google-modules/terraform-google-network/issues/269)) ([5b00673](https://www.github.com/terraform-google-modules/terraform-google-network/commit/5b006736344bb125c2416c7a5d37038798112374))\n+\n ## [3.2.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.2...v3.2.0) (2021-03-04)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.2.1\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.2.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.0...v3.2.1) (2021-04-08)\n+\n+\n+### Bug Fixes\n+\n+* Switch shared_vpc resources to beta provider in access submodule ([#269](https://www.github.com/terraform-google-modules/terraform-google-network/issues/269)) ([5b00673](https://www.github.com/terraform-google-modules/terraform-google-network/commit/5b006736344bb125c2416c7a5d37038798112374))\n+\n ## [3.2.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.2...v3.2.0) (2021-03-04)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.2.1\"\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 VPC/network 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### [3.2.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.1...v3.2.2) (2021-04-24)\n\n\n### Bug Fixes\n\n* Add variable type for http_target_tags variable ([#276](https://www.github.com/terraform-google-modules/terraform-google-network/issues/276)) ([08842fa](https://www.github.com/terraform-google-modules/terraform-google-network/commit/08842fab8810f1d304a82328f145fac4bc2d10cf))\n---\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@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.2.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.1...v3.2.2) (2021-04-24)\n+\n+\n+### Bug Fixes\n+\n+* Add variable type for http_target_tags variable ([#276](https://www.github.com/terraform-google-modules/terraform-google-network/issues/276)) ([08842fa](https://www.github.com/terraform-google-modules/terraform-google-network/commit/08842fab8810f1d304a82328f145fac4bc2d10cf))\n+\n ### [3.2.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.0...v3.2.1) (2021-04-08)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.2\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.2\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.2\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.2\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.2\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n module_name provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.2\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.2\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.2.2\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.2.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.1...v3.2.2) (2021-04-24)\n+\n+\n+### Bug Fixes\n+\n+* Add variable type for http_target_tags variable ([#276](https://www.github.com/terraform-google-modules/terraform-google-network/issues/276)) ([08842fa](https://www.github.com/terraform-google-modules/terraform-google-network/commit/08842fab8810f1d304a82328f145fac4bc2d10cf))\n+\n ### [3.2.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.0...v3.2.1) (2021-04-08)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.2\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.2\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.2\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.2\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.2\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.2\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform terraform }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.2\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.2.2\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.2.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.1...v3.2.2) (2021-04-24)\n+\n+\n+### Bug Fixes\n+\n+* Add variable type for http_target_tags variable ([#276](https://www.github.com/terraform-google-modules/terraform-google-network/issues/276)) ([08842fa](https://www.github.com/terraform-google-modules/terraform-google-network/commit/08842fab8810f1d304a82328f145fac4bc2d10cf))\n+\n ### [3.2.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.0...v3.2.1) (2021-04-08)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.2\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.2\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.2\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.2\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.2\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.2\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name -24,6 \"blueprints/terraform/terraform-google-network:subnets/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.2\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.2.2\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.2.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.1...v3.2.2) (2021-04-24)\n+\n+\n+### Bug Fixes\n+\n+* Add variable type for http_target_tags variable ([#276](https://www.github.com/terraform-google-modules/terraform-google-network/issues/276)) ([08842fa](https://www.github.com/terraform-google-modules/terraform-google-network/commit/08842fab8810f1d304a82328f145fac4bc2d10cf))\n+\n ### [3.2.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.0...v3.2.1) (2021-04-08)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.2\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.2\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.2\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.2\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.2\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.2\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.2\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.2.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.2.2\"\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 VPC/network 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## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n\n\n### Features\n\n* Adding vpc-serverless-connector-submodule-beta ([#280](https://www.github.com/terraform-google-modules/terraform-google-network/issues/280)) ([3f720fa](https://www.github.com/terraform-google-modules/terraform-google-network/commit/3f720fa5d44639f5605b1b5b07a92bedad0f67ca))\n\n\n### Bug Fixes\n\n* adds `subnet_ids` as an output ([#299](https://www.github.com/terraform-google-modules/terraform-google-network/issues/299)) ([fe89ce6](https://www.github.com/terraform-google-modules/terraform-google-network/commit/fe89ce6e0b7155cc481c95359eb1b5b78310d1bc))\n---\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@@ -2,6 +2,18 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n+\n+\n+### Features\n+\n+* Adding vpc-serverless-connector-submodule-beta ([#280](https://www.github.com/terraform-google-modules/terraform-google-network/issues/280)) ([3f720fa](https://www.github.com/terraform-google-modules/terraform-google-network/commit/3f720fa5d44639f5605b1b5b07a92bedad0f67ca))\n+\n+\n+### Bug Fixes\n+\n+* adds `subnet_ids` as an output ([#299](https://www.github.com/terraform-google-modules/terraform-google-network/issues/299)) ([fe89ce6](https://www.github.com/terraform-google-modules/terraform-google-network/commit/fe89ce6e0b7155cc481c95359eb1b5b78310d1bc))\n+\n ### [3.2.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.1...v3.2.2) (2021-04-24)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.3.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,18 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n+\n+\n+### Features\n+\n+* Adding vpc-serverless-connector-submodule-beta ([#280](https://www.github.com/terraform-google-modules/terraform-google-network/issues/280)) ([3f720fa](https://www.github.com/terraform-google-modules/terraform-google-network/commit/3f720fa5d44639f5605b1b5b07a92bedad0f67ca))\n+\n+\n+### Bug Fixes\n+\n+* adds `subnet_ids` as an output ([#299](https://www.github.com/terraform-google-modules/terraform-google-network/issues/299)) ([fe89ce6](https://www.github.com/terraform-google-modules/terraform-google-network/commit/fe89ce6e0b7155cc481c95359eb1b5b78310d1bc))\n+\n ### [3.2.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.1...v3.2.2) (2021-04-24)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.3.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,18 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n+\n+\n+### Features\n+\n+* Adding vpc-serverless-connector-submodule-beta ([#280](https://www.github.com/terraform-google-modules/terraform-google-network/issues/280)) ([3f720fa](https://www.github.com/terraform-google-modules/terraform-google-network/commit/3f720fa5d44639f5605b1b5b07a92bedad0f67ca))\n+\n+\n+### Bug Fixes\n+\n+* adds `subnet_ids` as an output ([#299](https://www.github.com/terraform-google-modules/terraform-google-network/issues/299)) ([fe89ce6](https://www.github.com/terraform-google-modules/terraform-google-network/commit/fe89ce6e0b7155cc481c95359eb1b5b78310d1bc))\n+\n ### [3.2.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.1...v3.2.2) (2021-04-24)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.2\"\n+ module_name = Fixes\n+\n+* }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.3.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,18 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.2...v3.3.0) (2021-06-01)\n+\n+\n+### Features\n+\n+* Adding vpc-serverless-connector-submodule-beta ([#280](https://www.github.com/terraform-google-modules/terraform-google-network/issues/280)) ([3f720fa](https://www.github.com/terraform-google-modules/terraform-google-network/commit/3f720fa5d44639f5605b1b5b07a92bedad0f67ca))\n+\n+\n+### Bug Fixes\n+\n+* adds `subnet_ids` as an output ([#299](https://www.github.com/terraform-google-modules/terraform-google-network/issues/299)) ([fe89ce6](https://www.github.com/terraform-google-modules/terraform-google-network/commit/fe89ce6e0b7155cc481c95359eb1b5b78310d1bc))\n+\n ### [3.2.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.2.1...v3.2.2) (2021-04-24)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.3.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.3.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.3.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.3.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.3.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.3.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.3.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.3.0\"\n }\n }\n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v3.3.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -28,9 +28,9 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.3.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.2.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.3.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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis is a potential update to address feature request #220. It adds an `mtu` variable to root and vpc modules that will set MTU on `google_compute_network` resource.\r\n\r\nThe update has been tested in a few non-production VPCs without any problems yet.\r\n\r\n*Note:* MTU suport has a dependency on release [3.45.0](https://github.com/hashicorp/terraform-provider-google/releases/tag/v3.45.0) of google provider.\n\n---\n\nChoice A:\nREADME.md\n@@ -97,6 +97,7 @@ Then perform the following commands on the root folder:\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n+| mtu | The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive. | `number` | `1460` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routes | List of routes being created in this VPC | `list(map(string))` | `[]` | no |\n---\nexamples/delete_default_gateway_routes/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/ilb_routing/main.tf\n@@ -15,11 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 2.19.0\"\n-}\n-\n-provider \"google-beta\" {\n- version = \"~> 2.19.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/multi_vpc/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/secondary_ranges/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/simple_project/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/simple_project_with_regional_network/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/submodule_firewall/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/submodule_network_peering/main.tf\n@@ -15,11 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n-}\n-\n-provider \"google-beta\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/submodule_svpc_access/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nmain.tf\n@@ -26,6 +26,7 @@ module \"vpc\" {\n description = var.description\n shared_vpc_host = var.shared_vpc_host\n delete_default_internet_gateway_routes = var.delete_default_internet_gateway_routes\n+ mtu `false` = var.mtu\n }\n \n /******************************************\n---\nmodules/vpc/README.md\n@@ -31,6 +31,7 @@ module \"vpc\" {\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n+| mtu | The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive. | `number` | `1460` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n---\nmodules/vpc/main.tf\n@@ -24,6 +24,7 @@ resource \"google_compute_network\" \"network\" {\n project = var.project_id\n description = var.description\n delete_default_routes_on_create = var.delete_default_internet_gateway_routes\n+ mtu = var.mtu\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -51,3 +51,9 @@ variable \"delete_default_internet_gateway_routes\" {\n description = \"If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted\"\n default = false\n }\n+\n+variable \"mtu\" {\n+ type = number\n+ description = \"The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive.\"\n+ default = 1460\n+}\n---\nmodules/vpc/versions.tf\n@@ -17,6 +17,6 @@\n terraform {\n required_version = \">=0.12.6\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = \"<4.0,>= 3.45\"\n }\n }\n---\ntest/integration/simple_project/controls/gcloud.rb\n@@ -57,7 +57,8 @@\n \"aggregationInterval\" => \"INTERVAL_5_SEC\",\n \"enable\" => true,\n \"flowSampling\" => 0.5,\n- \"metadata\" => \"INCLUDE_ALL_METADATA\"\n+ \"metadata\" => \"INCLUDE_ALL_METADATA\",\n+ \"filterExpr\" => \"true\"\n }\n )\n end\n@@ -81,7 +82,8 @@\n \"aggregationInterval\" => \"INTERVAL_10_MIN\",\n \"enable\" => true,\n \"flowSampling\" => 0.7,\n- \"metadata\" => \"INCLUDE_ALL_METADATA\"\n+ \"metadata\" => \"INCLUDE_ALL_METADATA\",\n+ \"filterExpr\" => \"true\"\n }\n )\n end\n---\nvariables.tf\n@@ -69,3 +69,9 @@ variable \"auto_create_subnetworks\" {\n description = \"When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources.\"\n default = false\n }\n+\n+variable \"mtu\" {\n+ type = number\n+ description = \"The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive.\"\n+ default = 1460\n+}\n---\n\n\n---\n\nChoice B:\nREADME.md\n@@ -97,6 +97,7 of Then perform the following commands on the root folder:\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n+| mtu | The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive. | `number` | `1460` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routes | List of routes being created in this VPC | `list(map(string))` | `[]` | no |\n---\nexamples/delete_default_gateway_routes/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/ilb_routing/main.tf\n@@ -15,11 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 2.19.0\"\n-}\n-\n-provider \"google-beta\" {\n- version = \"~> 2.19.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/multi_vpc/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/secondary_ranges/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/simple_project/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/simple_project_with_regional_network/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/submodule_firewall/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/submodule_network_peering/main.tf\n@@ -15,11 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n-}\n-\n-provider \"google-beta\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/submodule_svpc_access/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nmain.tf\n@@ -26,6 +26,7 @@ module \"vpc\" {\n description = var.description\n shared_vpc_host = var.shared_vpc_host\n delete_default_internet_gateway_routes = var.delete_default_internet_gateway_routes\n+ mtu = var.mtu\n }\n \n /******************************************\n---\nmodules/vpc/README.md\n@@ -31,6 +31,7 @@ module \"vpc\" {\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n+| mtu | The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive. | `number` | `1460` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n---\nmodules/vpc/main.tf\n@@ -24,6 +24,7 @@ resource \"google_compute_network\" \"network\" {\n project = var.project_id\n description = var.description\n delete_default_routes_on_create = var.delete_default_internet_gateway_routes\n+ mtu = var.mtu\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -51,3 +51,9 @@ variable \"delete_default_internet_gateway_routes\" {\n description = \"If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted\"\n default = false\n }\n+\n+variable \"mtu\" {\n+ type = number\n+ description = \"The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive.\"\n+ default = 1460\n+}\n---\nmodules/vpc/versions.tf\n@@ -17,6 +17,6 @@\n terraform {\n required_version = \">=0.12.6\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = \"<4.0,>= 3.45\"\n }\n }\n---\ntest/integration/simple_project/controls/gcloud.rb\n@@ -57,7 +57,8 @@\n \"aggregationInterval\" => \"INTERVAL_5_SEC\",\n \"enable\" => true,\n \"flowSampling\" => 0.5,\n- \"metadata\" => \"INCLUDE_ALL_METADATA\"\n+ \"metadata\" => \"INCLUDE_ALL_METADATA\",\n+ \"filterExpr\" => \"true\"\n }\n )\n end\n@@ -81,7 +82,8 @@\n \"aggregationInterval\" => \"INTERVAL_10_MIN\",\n \"enable\" => true,\n \"flowSampling\" => 0.7,\n- \"metadata\" => \"INCLUDE_ALL_METADATA\"\n+ \"metadata\" => \"INCLUDE_ALL_METADATA\",\n+ \"filterExpr\" => \"true\"\n }\n )\n end\n---\nvariables.tf\n@@ -69,3 +69,9 @@ variable \"auto_create_subnetworks\" {\n description = \"When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources.\"\n default = false\n }\n+\n+variable \"mtu\" {\n+ type = number\n+ description = \"The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive.\"\n+ default = 1460\n+}\n---\n\n\n---\n\nChoice C:\nREADME.md\n@@ -97,6 +97,7 @@ Then perform the following commands on the root folder:\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n+| mtu | The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive. | `number` | `1460` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routes | List of routes being created in this VPC | `list(map(string))` | `[]` | no |\n---\nexamples/delete_default_gateway_routes/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/ilb_routing/main.tf\n@@ -15,11 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 2.19.0\"\n-}\n-\n-provider \"google-beta\" {\n- version = \"~> 2.19.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/multi_vpc/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/secondary_ranges/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/simple_project/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/simple_project_with_regional_network/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/submodule_firewall/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/submodule_network_peering/main.tf\n@@ -15,11 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n-}\n-\n-provider \"google-beta\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/submodule_svpc_access/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nmain.tf\n@@ -26,6 +26,7 @@ module \"vpc\" {\n description = var.description\n shared_vpc_host = var.shared_vpc_host\n delete_default_internet_gateway_routes = var.delete_default_internet_gateway_routes\n+ mtu = var.mtu\n }\n \n /******************************************\n---\nmodules/vpc/README.md\n@@ -31,6 +31,7 @@ module \"vpc\" {\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n+| mtu | The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive. | `number` | `1460` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n---\nmodules/vpc/main.tf\n@@ -24,6 +24,7 @@ resource \"google_compute_network\" \"network\" {\n project = var.project_id\n description = var.description\n delete_default_routes_on_create = var.delete_default_internet_gateway_routes\n+ mtu = var.mtu\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -51,3 +51,9 @@ variable \"delete_default_internet_gateway_routes\" {\n description = \"If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted\"\n default = false\n }\n+\n+variable \"mtu\" {\n+ type = number\n+ description = \"The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive.\"\n+ default = 1460\n+}\n---\nmodules/vpc/versions.tf\n@@ -17,6 +17,6 @@\n terraform {\n required_version = \">=0.12.6\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = \"<4.0,>= 3.45\"\n }\n }\n---\ntest/integration/simple_project/controls/gcloud.rb\n@@ -57,7 +57,8 @@\n \"aggregationInterval\" => \"INTERVAL_5_SEC\",\n \"enable\" => true,\n \"flowSampling\" => 0.5,\n- \"metadata\" => \"INCLUDE_ALL_METADATA\"\n+ \"metadata\" => \"INCLUDE_ALL_METADATA\",\n+ \"filterExpr\" => \"true\"\n }\n )\n end\n@@ -81,7 +82,8 @@\n 3.3.0\"\n+ \"aggregationInterval\" => \"INTERVAL_10_MIN\",\n \"enable\" => true,\n \"flowSampling\" => 0.7,\n- \"metadata\" => \"INCLUDE_ALL_METADATA\"\n+ \"metadata\" => \"INCLUDE_ALL_METADATA\",\n+ \"filterExpr\" => \"true\"\n }\n )\n end\n---\nvariables.tf\n@@ -69,3 +69,9 @@ variable \"auto_create_subnetworks\" {\n description = \"When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources.\"\n default = false\n }\n+\n+variable \"mtu\" {\n+ type = number\n+ description = \"The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive.\"\n+ default = 1460\n+}\n---\n\n\n---\n\nChoice D:\nREADME.md\n@@ -97,6 +97,7 @@ Then perform the following commands on the root folder:\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n+| mtu | The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive. | `number` | `1460` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routes | List of routes being created in this VPC | `list(map(string))` | `[]` | no |\n---\nexamples/delete_default_gateway_routes/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/ilb_routing/main.tf\n@@ -15,11 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 2.19.0\"\n-}\n-\n-provider \"google-beta\" {\n- version = \"~> 2.19.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/multi_vpc/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/secondary_ranges/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/simple_project/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/simple_project_with_regional_network/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/submodule_firewall/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/submodule_network_peering/main.tf\n@@ -15,11 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n-}\n-\n-provider \"google-beta\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nexamples/submodule_svpc_access/main.tf\n@@ -15,7 +15,7 @@\n */\n \n provider \"google\" {\n- version = \"~> 3.3.0\"\n+ version = \"~> 3.45.0\"\n }\n \n provider \"null\" {\n---\nmain.tf\n@@ -26,6 +26,7 @@ module \"vpc\" {\n description = var.description\n shared_vpc_host = var.shared_vpc_host\n delete_default_internet_gateway_routes = var.delete_default_internet_gateway_routes\n+ mtu = var.mtu\n }\n \n /******************************************\n---\nmodules/vpc/README.md\n@@ -31,6 +31,7 @@ module \"vpc\" {\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | delete\\_default\\_internet\\_gateway\\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n+| mtu | The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive. | `number` | `1460` | no |\n | network\\_name | The name of the network being created | `any` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n---\nmodules/vpc/main.tf\n@@ -24,6 +24,7 @@ resource \"google_compute_network\" \"network\" {\n project = var.project_id\n description = var.description\n delete_default_routes_on_create = var.delete_default_internet_gateway_routes\n+ mtu = var.mtu\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -51,3 +51,9 @@ variable \"delete_default_internet_gateway_routes\" {\n description = \"If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted\"\n default = false\n }\n+\n+variable \"mtu\" {\n+ type = number\n+ description = \"The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive.\"\n+ default = 1460\n+}\n---\nmodules/vpc/versions.tf\n@@ -17,6 +17,6 @@\n terraform {\n required_version = \">=0.12.6\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = \"<4.0,>= 3.45\"\n }\n }\n---\ntest/integration/simple_project/controls/gcloud.rb\n@@ -57,7 +57,8 @@\n \"aggregationInterval\" => \"INTERVAL_5_SEC\",\n \"enable\" => true,\n \"flowSampling\" => 0.5,\n- \"metadata\" => \"INCLUDE_ALL_METADATA\"\n+ \"metadata\" => \"INCLUDE_ALL_METADATA\",\n+ \"filterExpr\" => \"true\"\n }\n )\n end\n@@ -81,7 +82,8 @@\n \"aggregationInterval\" => \"INTERVAL_10_MIN\",\n \"enable\" => true,\n \"flowSampling\" => 0.7,\n- \"metadata\" => \"INCLUDE_ALL_METADATA\"\n+ \"metadata\" => \"INCLUDE_ALL_METADATA\",\n+ \"filterExpr\" => \"true\"\n }\n )\n end\n---\nvariables.tf\n@@ -69,3 +69,9 @@ variable \"auto_create_subnetworks\" {\n description = \"When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources.\"\n default = false\n }\n+\n+variable \"mtu\" {\n+ type = number\n+ description = \"The network MTU (default '1460'). Must be a value between 1460 and 1500 inclusive.\"\n+ default = 1460\n+}\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nReferencing other Google modules like\nhttps://github.com/terraform-google-modules/terraform-google-project-factory/pull/505\n\nSigned-off-by: Yong Wen Chua <[email protected]>\n\n\n---\n\nChoice A:\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n\nChoice B:\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n\nChoice C:\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ +15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n\nChoice D:\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n +15,5 required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n\n\n---\n\nChoice A:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.2\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -166,4 +166,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google-beta = \"~> 2.19.0\"\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"~> 3.0\"\n+ }\n+ }\n+\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google-beta = \">= 2.19.0, <4.0.0\"\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"<4.0,>= 2.19\"\n+ }\n+ }\n+\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 3.45\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"~> 3.45\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.0\"\n }\n }\n---\nversions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.0.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.2\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -166,4 +166,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google-beta = \"~> 2.19.0\"\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"~> 3.0\"\n+ }\n+ }\n+\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google-beta = \">= 2.19.0, <4.0.0\"\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"<4.0,>= 2.19\"\n+ }\n+ }\n+\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 3.45\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"~> 3.45\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.0\"\n }\n }\n---\nversions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.0.0\"\n }\n }\n+\n\n---\n\nChoice C:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.2\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -166,4 +166,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google-beta = \"~> 2.19.0\"\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"~> 3.0\"\n+ }\n+ }\n+\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google-beta = \">= 2.19.0, <4.0.0\"\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"<4.0,>= 2.19\"\n+ }\n+ }\n+\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 3.45\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"~> 3.45\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.0\"\n }\n }\n---\nversions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.0.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.2\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -166,4 +166,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google-beta = \"~> 2.19.0\"\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"~> 3.0\"\n+ }\n+ }\n+\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google-beta = \">= 2.19.0, <4.0.0\"\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ version = \"<4.0,>= 2.19\"\n+ }\n+ }\n+\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 3.45\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"~> 3.45\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.0\"\n }\n }\n---\nversions.tf\n@@ -15,8 +15,15 @@\n */\n \n terraform {\n- required_version = \">=0.12.6\"\n+ provider_meta required_version = \">= 0.13.0\"\n required_providers {\n- google = \"<4.0,>= 2.12\"\n+ google = {\n+ source = \"hashicorp/google\"\n+ version = \"<4.0,>= 2.12\"\n+ }\n+ }\n+\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.0.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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis introduces support for the export_subnet_routes_with_public_ip and import_subnet_routes_with_public_ip variables in the google_compute_network_peering resources. This is necessary when peering VPCs that are using Privately Used Public IPs (PUPIs) as the private subnet IPs.\r\n\r\nNote - the defaults proposed in this PR are false for both variables, but the provider's default for [export_subnet_routes_with_public_ip](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#export_subnet_routes_with_public_ip) is true (the import variable is also set to false, by default, here); because these come in pairs (defining each end of the peering), and because the current Network Peering submodule doesn't override these defaults, it will cause each peering will attempt to export these subnets but neither peering will attempt to import them; not a problem, really, but the proposed solution also addresses this incongruence, by default.\r\n\r\nFixes #248\n\n---\n\nChoice A:\nmodules/network-peering/README.md\n@@ -49,7 +49,9 @@ module \"peering-a-c\" {\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n | export\\_local\\_custom\\_routes | Export custom routes to peer network from local network. | `bool` | `false` | no |\n+| export\\_local\\_subnet\\_routes\\_with\\_public\\_ip | Export custom routes to peer network from local network (defaults to true; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#export_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default). | `bool` | `true` | no |\n | export\\_peer\\_custom\\_routes | Export custom routes to local network from peer network. | `bool` | `false` | no |\n+| export\\_peer\\_subnet\\_routes\\_with\\_public\\_ip | Export custom routes to local network from peer network (defaults to false; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#import_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default). | `bool` | `false` | no |\n | local\\_network | Resource link of the network to add a peering to. | `string` | n/a | yes |\n | module\\_depends\\_on | List of modules or resources this module depends on. | `list(any)` | `[]` | no |\n | peer\\_network | Resource link of the peer network. | `string` | n/a | yes |\n---\nmodules/network-peering/main.tf\n@@ -30,6 +30,7 @@ resource \"random_string\" \"network_peering_suffix\" {\n special = false\n length = 4\n }\n+\n resource \"google_compute_network_peering\" \"local_network_peering\" {\n provider = google-beta\n name = local.local_network_peering_name\n@@ -38,6 +39,9 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n export_custom_routes = var.export_local_custom_routes\n import_custom_routes = var.export_peer_custom_routes\n \n+ export_subnet_routes_with_public_ip = var.export_local_subnet_routes_with_public_ip\n+ import_subnet_routes_with_public_ip = var.export_peer_subnet_routes_with_public_ip\n+\n depends_on = [null_resource.module_depends_on]\n }\n \n@@ -49,6 +53,9 @@ resource \"google_compute_network_peering\" \"peer_network_peering\" {\n export_custom_routes = var.export_peer_custom_routes\n import_custom_routes = var.export_local_custom_routes\n \n+ export_subnet_routes_with_public_ip = var.export_peer_subnet_routes_with_public_ip\n+ import_subnet_routes_with_public_ip = var.export_local_subnet_routes_with_public_ip\n+\n depends_on = [null_resource.module_depends_on, google_compute_network_peering.local_network_peering]\n }\n \n---\nmodules/network-peering/variables.tf\n@@ -42,6 +42,18 @@ variable \"export_local_custom_routes\" {\n default = false\n }\n \n+variable \"export_peer_subnet_routes_with_public_ip\" {\n+ description = \"Export custom routes to local network from peer network (defaults to false; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#import_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default).\"\n+ type = bool\n+ default = false\n+}\n+\n+variable \"export_local_subnet_routes_with_public_ip\" {\n+ description = \"Export custom routes to peer network from local (defaults to true; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#export_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default).\"\n+ type = bool\n+ default = true\n+}\n+\n variable \"module_depends_on\" {\n description = \"List of modules or resources this module depends on.\"\n type = list(any)\n---\n\n\n---\n\nChoice B:\nmodules/network-peering/README.md\n@@ -49,7 +49,9 @@ module \"peering-a-c\" {\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n | export\\_local\\_custom\\_routes | Export custom routes to peer network from local network. | `bool` | `false` | no |\n+| export\\_local\\_subnet\\_routes\\_with\\_public\\_ip | Export custom routes to peer network from local network (defaults to true; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#export_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default). | `bool` | `true` | no |\n | export\\_peer\\_custom\\_routes | Export custom routes to local network from peer network. | `bool` | `false` | no |\n+| export\\_peer\\_subnet\\_routes\\_with\\_public\\_ip | Export custom routes to local network from peer network (defaults to false; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#import_subnet_routes_with_public_ip), and {\n Remote Peering Connection to be opposite the provider default). | `bool` | `false` | no |\n | local\\_network | Resource link of the network to add a peering to. | `string` | n/a | yes |\n | module\\_depends\\_on | List of modules or resources this module depends on. | `list(any)` | `[]` | no |\n | peer\\_network | Resource link of the peer network. | `string` | n/a | yes |\n---\nmodules/network-peering/main.tf\n@@ -30,6 +30,7 @@ resource \"random_string\" \"network_peering_suffix\" {\n special = false\n length = 4\n }\n+\n resource \"google_compute_network_peering\" \"local_network_peering\" {\n provider = google-beta\n name = local.local_network_peering_name\n@@ -38,6 +39,9 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n export_custom_routes = var.export_local_custom_routes\n import_custom_routes = var.export_peer_custom_routes\n \n+ export_subnet_routes_with_public_ip = var.export_local_subnet_routes_with_public_ip\n+ import_subnet_routes_with_public_ip = var.export_peer_subnet_routes_with_public_ip\n+\n depends_on = [null_resource.module_depends_on]\n }\n \n@@ -49,6 +53,9 @@ resource \"google_compute_network_peering\" \"peer_network_peering\" {\n export_custom_routes = var.export_peer_custom_routes\n import_custom_routes = var.export_local_custom_routes\n \n+ export_subnet_routes_with_public_ip = var.export_peer_subnet_routes_with_public_ip\n+ import_subnet_routes_with_public_ip = var.export_local_subnet_routes_with_public_ip\n+\n depends_on = [null_resource.module_depends_on, google_compute_network_peering.local_network_peering]\n }\n \n---\nmodules/network-peering/variables.tf\n@@ -42,6 +42,18 @@ variable \"export_local_custom_routes\" {\n default = false\n }\n \n+variable \"export_peer_subnet_routes_with_public_ip\" {\n+ description = \"Export custom routes to local network from peer network (defaults to false; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#import_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default).\"\n+ type = bool\n+ default = false\n+}\n+\n+variable \"export_local_subnet_routes_with_public_ip\" {\n+ description = \"Export custom routes to peer network from local network (defaults to true; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#export_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default).\"\n+ type = bool\n+ default = true\n+}\n+\n variable \"module_depends_on\" {\n description = \"List of modules or resources this module depends on.\"\n type = list(any)\n---\n\n\n---\n\nChoice C:\nmodules/network-peering/README.md\n@@ -49,7 +49,9 @@ module \"peering-a-c\" {\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n | export\\_local\\_custom\\_routes | Export custom routes to peer network from local network. | `bool` | `false` | no |\n+| export\\_local\\_subnet\\_routes\\_with\\_public\\_ip | Export custom routes to peer network from local network (defaults to true; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#export_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default). | `bool` | `true` | no |\n | export\\_peer\\_custom\\_routes | Export custom routes to local network from peer network. | `bool` | `false` | no |\n+| export\\_peer\\_subnet\\_routes\\_with\\_public\\_ip | Export custom routes to local network from peer network (defaults to false; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#import_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default). | `bool` | `false` | no |\n | local\\_network | Resource link of the network to add a peering to. | `string` | n/a | yes |\n | module\\_depends\\_on | List of modules or resources this module depends on. | `list(any)` | `[]` | no |\n | peer\\_network | Resource link of the peer network. | `string` | n/a | yes |\n---\nmodules/network-peering/main.tf\n@@ -30,6 +30,7 @@ resource \"random_string\" \"network_peering_suffix\" {\n special = false\n length = 4\n }\n+\n resource \"google_compute_network_peering\" \"local_network_peering\" {\n provider = google-beta\n name = local.local_network_peering_name\n@@ -38,6 +39,9 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n export_custom_routes = var.export_local_custom_routes\n import_custom_routes = var.export_peer_custom_routes\n \n+ export_subnet_routes_with_public_ip = var.export_local_subnet_routes_with_public_ip\n+ import_subnet_routes_with_public_ip = var.export_peer_subnet_routes_with_public_ip\n+\n depends_on = [null_resource.module_depends_on]\n }\n \n@@ -49,6 +53,9 @@ resource \"google_compute_network_peering\" \"peer_network_peering\" {\n export_custom_routes = var.export_peer_custom_routes\n import_custom_routes = var.export_local_custom_routes\n \n+ export_subnet_routes_with_public_ip = var.export_peer_subnet_routes_with_public_ip\n+ import_subnet_routes_with_public_ip = var.export_local_subnet_routes_with_public_ip\n+\n depends_on = [null_resource.module_depends_on, google_compute_network_peering.local_network_peering]\n }\n \n---\nmodules/network-peering/variables.tf\n@@ -42,6 +42,18 @@ variable \"export_local_custom_routes\" {\n default = false\n }\n \n+variable \"export_peer_subnet_routes_with_public_ip\" {\n+ description = \"Export custom routes to local network from peer network (defaults to false; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#import_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default).\"\n+ type = bool\n+ default = false\n+}\n+\n+variable \"export_local_subnet_routes_with_public_ip\" {\n+ description = \"Export custom routes to peer network from local network (defaults to true; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#export_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default).\"\n+ type = bool\n+ default = true\n+}\n+\n variable \"module_depends_on\" {\n description = \"List of modules or resources this module depends on.\"\n type = list(any)\n---\n\n\n---\n\nChoice D:\nmodules/network-peering/README.md\n@@ -49,7 +49,9 @@ module \"peering-a-c\" {\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n | export\\_local\\_custom\\_routes | Export custom routes to peer network from local network. | `bool` | `false` | no |\n+| export\\_local\\_subnet\\_routes\\_with\\_public\\_ip | Export custom routes to peer network from local network (defaults to true\n+}\n+\n causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#export_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default). | `bool` | `true` | no |\n | export\\_peer\\_custom\\_routes | Export custom routes to local network from peer network. | `bool` | `false` | no |\n+| export\\_peer\\_subnet\\_routes\\_with\\_public\\_ip | Export custom routes to local network from peer network (defaults to false; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#import_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default). | `bool` | `false` | no |\n | local\\_network | Resource link of the network to add a peering to. | `string` | n/a | yes |\n | module\\_depends\\_on | List of modules or resources this module depends on. | `list(any)` | `[]` | no |\n | peer\\_network | Resource link of the peer network. | `string` | n/a | yes |\n---\nmodules/network-peering/main.tf\n@@ -30,6 +30,7 @@ resource \"random_string\" \"network_peering_suffix\" {\n special = false\n length = 4\n }\n+\n resource \"google_compute_network_peering\" \"local_network_peering\" {\n provider = google-beta\n name = local.local_network_peering_name\n@@ -38,6 +39,9 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n export_custom_routes = var.export_local_custom_routes\n import_custom_routes = var.export_peer_custom_routes\n \n+ export_subnet_routes_with_public_ip = var.export_local_subnet_routes_with_public_ip\n+ import_subnet_routes_with_public_ip = var.export_peer_subnet_routes_with_public_ip\n+\n depends_on = [null_resource.module_depends_on]\n }\n \n@@ -49,6 +53,9 @@ resource \"google_compute_network_peering\" \"peer_network_peering\" {\n export_custom_routes = var.export_peer_custom_routes\n import_custom_routes = var.export_local_custom_routes\n \n+ export_subnet_routes_with_public_ip = var.export_peer_subnet_routes_with_public_ip\n+ import_subnet_routes_with_public_ip = var.export_local_subnet_routes_with_public_ip\n+\n depends_on = [null_resource.module_depends_on, google_compute_network_peering.local_network_peering]\n }\n \n---\nmodules/network-peering/variables.tf\n@@ -42,6 +42,18 @@ variable \"export_local_custom_routes\" {\n default = false\n }\n \n+variable \"export_peer_subnet_routes_with_public_ip\" {\n+ description = \"Export custom routes to local network from peer network (defaults to false; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#import_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default).\"\n+ type = bool\n+ default = false\n+}\n+\n+variable \"export_local_subnet_routes_with_public_ip\" {\n+ description = \"Export custom routes to peer network from local network (defaults to true; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#export_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default).\"\n+ type = bool\n+ default = true\n+}\n+\n variable \"module_depends_on\" {\n description = \"List of modules or resources this module depends on.\"\n type = list(any)\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nIn resource \"google_compute_firewall\" \"custom\":\r\nenable_logging = lookup(each.value.extra_attributes, \"enable_logging\", null)\r\n\r\nDeprecated in favor of log_config\n\n---\n\nChoice A:\nmodules/fabric-net-firewall/main.tf\n@@ -131,7 +131,9 @@ resource \"google_compute_firewall\" \"custom\" {\n target_service_accounts = each.value.use_service_accounts ? each.value.targets : null\n disabled = lookup(each.value.extra_attributes, \"disabled\", false)\n priority = lookup(each.value.extra_attributes, \"priority\", 1000)\n- enable_logging = lookup(each.value.extra_attributes, \"enable_logging\", null)\n+ log_config {\n+ metadata = lookup(each.value.extra_attributes, \"log_config\", \"EXCLUDE_ALL_METADATA\")\n+ }\n \n dynamic \"allow\" {\n = [for rule in each.value.rules : rule if each.value.action == \"allow\"]\n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-firewall/main.tf\n@@ -131,7 +131,9 @@ resource \"google_compute_firewall\" \"custom\" {\n target_service_accounts = each.value.use_service_accounts ? each.value.targets : null\n disabled = lookup(each.value.extra_attributes, \"disabled\", false)\n priority rule = lookup(each.value.extra_attributes, \"priority\", 1000)\n- enable_logging = lookup(each.value.extra_attributes, \"enable_logging\", null)\n+ log_config {\n+ metadata = lookup(each.value.extra_attributes, \"log_config\", \"EXCLUDE_ALL_METADATA\")\n+ }\n \n dynamic \"allow\" {\n for_each = [for rule in each.value.rules : rule if each.value.action == \"allow\"]\n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-firewall/main.tf\n@@ -131,7 +131,9 @@ resource \"google_compute_firewall\" \"custom\" {\n target_service_accounts = each.value.use_service_accounts ? each.value.targets : null\n disabled = lookup(each.value.extra_attributes, \"disabled\", false)\n priority = lookup(each.value.extra_attributes, \"priority\", 1000)\n- enable_logging = lookup(each.value.extra_attributes, \"enable_logging\", null)\n+ log_config {\n+ metadata = lookup(each.value.extra_attributes, \"log_config\", \"EXCLUDE_ALL_METADATA\")\n+ }\n \n dynamic \"allow\" {\n for_each = [for rule in each.value.rules : rule if each.value.action == \"allow\"]\n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-firewall/main.tf\n@@ -131,7 +131,9 @@ resource \"google_compute_firewall\" \"custom\" {\n target_service_accounts = each.value.use_service_accounts ? each.value.targets : null\n disabled = lookup(each.value.extra_attributes, \"disabled\", false)\n priority = lookup(each.value.extra_attributes, \"priority\", 1000)\n- enable_logging = lookup(each.value.extra_attributes, \"enable_logging\", null)\n+ log_config {\n+ metadata = lookup(each.value.extra_attributes, \"log_config\", \"EXCLUDE_ALL_METADATA\")\n+ }\n \n dynamic \"allow\" {\n for_each = [for rule in each.value.rules : rule if each.value.action == \"allow\"]\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network 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### [3.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.0...v3.0.1) (2021-01-15)\n\n\n### Bug Fixes\n\n* Automatically truncate VPC peering name if necessary ([#229](https://www.github.com/terraform-google-modules/terraform-google-network/issues/229)) ([67e833a](https://www.github.com/terraform-google-modules/terraform-google-network/commit/67e833a701fb4bc36aaeebbf88daea9a6f5e97b0))\n* By default, accept standard API MTU configuration of 1460 ([#226](https://www.github.com/terraform-google-modules/terraform-google-network/issues/226)) ([26507ba](https://www.github.com/terraform-google-modules/terraform-google-network/commit/26507ba861c24e190bf52d02c483786e7b660faa))\n---\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@@ -2,6 +2,14 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.0...v3.0.1) (2021-01-15)\n+\n+\n+### Bug Fixes\n+\n+* Automatically truncate VPC peering name if necessary ([#229](https://www.github.com/terraform-google-modules/terraform-google-network/issues/229)) ([67e833a](https://www.github.com/terraform-google-modules/terraform-google-network/commit/67e833a701fb4bc36aaeebbf88daea9a6f5e97b0))\n+* By default, accept standard API MTU configuration of 1460 ([#226](https://www.github.com/terraform-google-modules/terraform-google-network/issues/226)) ([26507ba](https://www.github.com/terraform-google-modules/terraform-google-network/commit/26507ba861c24e190bf52d02c483786e7b660faa))\n+\n ## [3.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v2.6.0...v3.0.0) (2020-12-29)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.0.1\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,14 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.0...v3.0.1) (2021-01-15)\n+\n+\n+### Bug Fixes\n+\n+* Automatically truncate VPC peering name if necessary ([#229](https://www.github.com/terraform-google-modules/terraform-google-network/issues/229)) ([67e833a](https://www.github.com/terraform-google-modules/terraform-google-network/commit/67e833a701fb4bc36aaeebbf88daea9a6f5e97b0))\n+* By default, accept standard API MTU configuration of 1460 ([#226](https://www.github.com/terraform-google-modules/terraform-google-network/issues/226)) ([26507ba](https://www.github.com/terraform-google-modules/terraform-google-network/commit/26507ba861c24e190bf52d02c483786e7b660faa))\n+\n ## [3.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v2.6.0...v3.0.0) (2020-12-29)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.0.1\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,14 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.0...v3.0.1) (2021-01-15)\n+\n+\n+### Bug Fixes\n+\n+* Automatically truncate VPC peering name if necessary ([#229](https://www.github.com/terraform-google-modules/terraform-google-network/issues/229)) ([67e833a](https://www.github.com/terraform-google-modules/terraform-google-network/commit/67e833a701fb4bc36aaeebbf88daea9a6f5e97b0))\n+* By default, accept standard API MTU configuration of 1460 ([#226](https://www.github.com/terraform-google-modules/terraform-google-network/issues/226)) ([26507ba](https://www.github.com/terraform-google-modules/terraform-google-network/commit/26507ba861c24e190bf52d02c483786e7b660faa))\n+\n ## [3.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v2.6.0...v3.0.0) (2020-12-29)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" terraform module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.0.1\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,14 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.0...v3.0.1) (2021-01-15)\n+\n+\n+### Bug Fixes\n+\n+* Automatically truncate VPC peering name if necessary ([#229](https://www.github.com/terraform-google-modules/terraform-google-network/issues/229)) ([67e833a](https://www.github.com/terraform-google-modules/terraform-google-network/commit/67e833a701fb4bc36aaeebbf88daea9a6f5e97b0))\n+* By default, accept standard API MTU configuration of 1460 ([#226](https://www.github.com/terraform-google-modules/terraform-google-network/issues/226)) ([26507ba](https://www.github.com/terraform-google-modules/terraform-google-network/commit/26507ba861c24e190bf52d02c483786e7b660faa))\n+\n ## [3.0.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v2.6.0...v3.0.0) (2020-12-29)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.0\"\n+ +2,14 module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.0.1\"\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 VPC/network 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## [3.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.1...v3.1.0) (2021-02-10)\n\n\n### Features\n\n* Add dedicated custom firewall rules module ([#200](https://www.github.com/terraform-google-modules/terraform-google-network/issues/200)) ([24f2a0f](https://www.github.com/terraform-google-modules/terraform-google-network/commit/24f2a0f2e133052ebf485edeb5b1f0ffa69a5829))\n* add next_hop_ilb to routes module ([#241](https://www.github.com/terraform-google-modules/terraform-google-network/issues/241)) ([87c8215](https://www.github.com/terraform-google-modules/terraform-google-network/commit/87c8215da8d7b7ba0bbbb6136ba77c6e047ca2f0))\n* Add support for enabling firewall logging on each rule ([#236](https://www.github.com/terraform-google-modules/terraform-google-network/issues/236)) ([2f44790](https://www.github.com/terraform-google-modules/terraform-google-network/commit/2f44790af2936887356dc7ed6b5f1cb343a7e578))\n---\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@@ -2,6 +2,15 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.1...v3.1.0) (2021-02-10)\n+\n+\n+### Features\n+\n+* Add dedicated custom firewall rules module ([#200](https://www.github.com/terraform-google-modules/terraform-google-network/issues/200)) ([24f2a0f](https://www.github.com/terraform-google-modules/terraform-google-network/commit/24f2a0f2e133052ebf485edeb5b1f0ffa69a5829))\n+* add next_hop_ilb to routes module ([#241](https://www.github.com/terraform-google-modules/terraform-google-network/issues/241)) ([87c8215](https://www.github.com/terraform-google-modules/terraform-google-network/commit/87c8215da8d7b7ba0bbbb6136ba77c6e047ca2f0))\n+* Add support for enabling firewall logging on each rule ([#236](https://www.github.com/terraform-google-modules/terraform-google-network/issues/236)) ([2f44790](https://www.github.com/terraform-google-modules/terraform-google-network/commit/2f44790af2936887356dc7ed6b5f1cb343a7e578))\n+\n ### [3.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.0...v3.0.1) (2021-01-15)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- \"blueprints/terraform/terraform-google-network:routes/v3.1.0\"\n module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.1.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,15 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.1...v3.1.0) (2021-02-10)\n+\n+\n+### Features\n+\n+* Add dedicated custom firewall rules module ([#200](https://www.github.com/terraform-google-modules/terraform-google-network/issues/200)) ([24f2a0f](https://www.github.com/terraform-google-modules/terraform-google-network/commit/24f2a0f2e133052ebf485edeb5b1f0ffa69a5829))\n+* add next_hop_ilb to routes module ([#241](https://www.github.com/terraform-google-modules/terraform-google-network/issues/241)) ([87c8215](https://www.github.com/terraform-google-modules/terraform-google-network/commit/87c8215da8d7b7ba0bbbb6136ba77c6e047ca2f0))\n+* Add support for enabling firewall logging on each rule ([#236](https://www.github.com/terraform-google-modules/terraform-google-network/issues/236)) ([2f44790](https://www.github.com/terraform-google-modules/terraform-google-network/commit/2f44790af2936887356dc7ed6b5f1cb343a7e578))\n+\n ### [3.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.0...v3.0.1) (2021-01-15)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.1.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,15 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.1...v3.1.0) (2021-02-10)\n+\n+\n+### Features\n+\n+* Add dedicated custom firewall rules module ([#200](https://www.github.com/terraform-google-modules/terraform-google-network/issues/200)) ([24f2a0f](https://www.github.com/terraform-google-modules/terraform-google-network/commit/24f2a0f2e133052ebf485edeb5b1f0ffa69a5829))\n+* add next_hop_ilb to routes module ([#241](https://www.github.com/terraform-google-modules/terraform-google-network/issues/241)) ([87c8215](https://www.github.com/terraform-google-modules/terraform-google-network/commit/87c8215da8d7b7ba0bbbb6136ba77c6e047ca2f0))\n+* Add support for enabling firewall logging on each rule ([#236](https://www.github.com/terraform-google-modules/terraform-google-network/issues/236)) ([2f44790](https://www.github.com/terraform-google-modules/terraform-google-network/commit/2f44790af2936887356dc7ed6b5f1cb343a7e578))\n+\n ### [3.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.0...v3.0.1) (2021-01-15)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.0\"\n }\n \n+## -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.1.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,15 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) file. commit guidelines.\n \n+## [3.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.1...v3.1.0) (2021-02-10)\n+\n+\n+### Features\n+\n+* Add dedicated custom firewall rules module ([#200](https://www.github.com/terraform-google-modules/terraform-google-network/issues/200)) ([24f2a0f](https://www.github.com/terraform-google-modules/terraform-google-network/commit/24f2a0f2e133052ebf485edeb5b1f0ffa69a5829))\n+* add next_hop_ilb to routes module ([#241](https://www.github.com/terraform-google-modules/terraform-google-network/issues/241)) ([87c8215](https://www.github.com/terraform-google-modules/terraform-google-network/commit/87c8215da8d7b7ba0bbbb6136ba77c6e047ca2f0))\n+* Add support for enabling firewall logging on each rule ([#236](https://www.github.com/terraform-google-modules/terraform-google-network/issues/236)) ([2f44790](https://www.github.com/terraform-google-modules/terraform-google-network/commit/2f44790af2936887356dc7ed6b5f1cb343a7e578))\n+\n ### [3.0.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.0...v3.0.1) (2021-01-15)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.1.0\"\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 VPC/network 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### [3.1.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.0...v3.1.1) (2021-02-16)\n\n\n### Bug Fixes\n\n* Allow next_hop_gateway to be passed for non-internet routes ([#242](https://www.github.com/terraform-google-modules/terraform-google-network/issues/242)) ([08d7167](https://www.github.com/terraform-google-modules/terraform-google-network/commit/08d716724ec43eb70f8c6a16481328a3145fba6f))\n* Update required Terraform version for firewall-rules submodule ([#245](https://www.github.com/terraform-google-modules/terraform-google-network/issues/245)) ([6a86ae2](https://www.github.com/terraform-google-modules/terraform-google-network/commit/6a86ae2fc58a579c7da4aec634929e58a8fdfa7e))\n---\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@@ -2,6 +2,14 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.1.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.0...v3.1.1) (2021-02-16)\n+\n+\n+### Bug Fixes\n+\n+* Allow next_hop_gateway to be passed for non-internet routes ([#242](https://www.github.com/terraform-google-modules/terraform-google-network/issues/242)) ([08d7167](https://www.github.com/terraform-google-modules/terraform-google-network/commit/08d716724ec43eb70f8c6a16481328a3145fba6f))\n+* Update required Terraform version for firewall-rules submodule ([#245](https://www.github.com/terraform-google-modules/terraform-google-network/issues/245)) ([6a86ae2](https://www.github.com/terraform-google-modules/terraform-google-network/commit/6a86ae2fc58a579c7da4aec634929e58a8fdfa7e))\n+\n ## [3.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.1...v3.1.0) (2021-02-10)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = = module_name = \"blueprints/terraform/terraform-google-network/v3.1.1\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,14 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.1.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.0...v3.1.1) (2021-02-16)\n+\n+\n+### Bug Fixes\n+\n+* Allow next_hop_gateway to be passed for non-internet routes ([#242](https://www.github.com/terraform-google-modules/terraform-google-network/issues/242)) ([08d7167](https://www.github.com/terraform-google-modules/terraform-google-network/commit/08d716724ec43eb70f8c6a16481328a3145fba6f))\n+* Update required Terraform version for firewall-rules submodule ([#245](https://www.github.com/terraform-google-modules/terraform-google-network/issues/245)) ([6a86ae2](https://www.github.com/terraform-google-modules/terraform-google-network/commit/6a86ae2fc58a579c7da4aec634929e58a8fdfa7e))\n+\n ## [3.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.1...v3.1.0) (2021-02-10)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.1.1\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,14 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.1.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.0...v3.1.1) (2021-02-16)\n+\n+\n+### Bug Fixes\n+\n+* Allow next_hop_gateway to be passed for non-internet routes ([#242](https://www.github.com/terraform-google-modules/terraform-google-network/issues/242)) ([08d7167](https://www.github.com/terraform-google-modules/terraform-google-network/commit/08d716724ec43eb70f8c6a16481328a3145fba6f))\n+* Update required Terraform version for firewall-rules submodule ([#245](https://www.github.com/terraform-google-modules/terraform-google-network/issues/245)) ([6a86ae2](https://www.github.com/terraform-google-modules/terraform-google-network/commit/6a86ae2fc58a579c7da4aec634929e58a8fdfa7e))\n+\n ## [3.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.1...v3.1.0) (2021-02-10)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.1.1\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,14 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.1.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.0...v3.1.1) Bug Fixes\n+\n+* Allow next_hop_gateway to be passed for non-internet routes ([#242](https://www.github.com/terraform-google-modules/terraform-google-network/issues/242)) ([08d7167](https://www.github.com/terraform-google-modules/terraform-google-network/commit/08d716724ec43eb70f8c6a16481328a3145fba6f))\n+* Update required Terraform version for firewall-rules submodule ([#245](https://www.github.com/terraform-google-modules/terraform-google-network/issues/245)) ([6a86ae2](https://www.github.com/terraform-google-modules/terraform-google-network/commit/6a86ae2fc58a579c7da4aec634929e58a8fdfa7e))\n+\n ## [3.1.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.0.1...v3.1.0) (2021-02-10)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.1\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.1\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.1\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.1\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.1\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.1\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.1\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.1\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.1\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.1.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 VPC/network 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### [3.1.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.1...v3.1.2) (2021-02-25)\n\n\n### Bug Fixes\n\n* Eliminate deprecation warning due to pre-0.12 string interpolation syntax ([#249](https://www.github.com/terraform-google-modules/terraform-google-network/issues/249)) ([1d833dc](https://www.github.com/terraform-google-modules/terraform-google-network/commit/1d833dc85cbea9052f239f328951c8f19ad4a382))\n---\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@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.1.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.1...v3.1.2) (2021-02-25)\n+\n+\n+### Bug Fixes\n+\n+* Eliminate deprecation warning due to pre-0.12 string interpolation syntax ([#249](https://www.github.com/terraform-google-modules/terraform-google-network/issues/249)) ([1d833dc](https://www.github.com/terraform-google-modules/terraform-google-network/commit/1d833dc85cbea9052f239f328951c8f19ad4a382))\n+\n ### [3.1.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.0...v3.1.1) (2021-02-16)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.2\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.2\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.2\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.2\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.2\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.2\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.2\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.2\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.2\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.1.2\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.1.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.1...v3.1.2) (2021-02-25)\n+\n+\n+### Bug Fixes\n+\n+* Eliminate deprecation warning due to pre-0.12 string interpolation syntax ([#249](https://www.github.com/terraform-google-modules/terraform-google-network/issues/249)) ([1d833dc](https://www.github.com/terraform-google-modules/terraform-google-network/commit/1d833dc85cbea9052f239f328951c8f19ad4a382))\n+\n ### [3.1.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.0...v3.1.1) (2021-02-16)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.2\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.2\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.2\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 to @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.2\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.2\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.2\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.2\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.2\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.2\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.1.2\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.1.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.1...v3.1.2) Bug Fixes\n+\n+* Eliminate deprecation warning due to pre-0.12 string interpolation syntax ([#249](https://www.github.com/terraform-google-modules/terraform-google-network/issues/249)) ([1d833dc](https://www.github.com/terraform-google-modules/terraform-google-network/commit/1d833dc85cbea9052f239f328951c8f19ad4a382))\n+\n ### [3.1.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.0...v3.1.1) (2021-02-16)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.2\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.2\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.2\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.2\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.2\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.2\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.2\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.2\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.2\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.1.2\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [3.1.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.1...v3.1.2) (2021-02-25)\n+\n+\n+### Bug Fixes\n+\n+* Eliminate deprecation warning due to pre-0.12 string interpolation syntax ([#249](https://www.github.com/terraform-google-modules/terraform-google-network/issues/249)) ([1d833dc](https://www.github.com/terraform-google-modules/terraform-google-network/commit/1d833dc85cbea9052f239f328951c8f19ad4a382))\n+\n ### [3.1.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.0...v3.1.1) (2021-02-16)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.2\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.2\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.2\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.2\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.2\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.2\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.2\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.2\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.2\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.1.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.1.2\"\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 VPC/network 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## [3.2.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.2...v3.2.0) (2021-03-04)\n\n\n### Features\n\n* Add support for export_local_subnet_routes_with_public_ip and export_peer_subnet_routes_with_public_ip ([#255](https://www.github.com/terraform-google-modules/terraform-google-network/issues/255)) ([8666553](https://www.github.com/terraform-google-modules/terraform-google-network/commit/8666553e0912af92e072eef9fa8c75e754af6f1b))\n---\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@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.2.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.2...v3.2.0) (2021-03-04)\n+\n+\n+### Features\n+\n+* Add support for export_local_subnet_routes_with_public_ip and export_peer_subnet_routes_with_public_ip ([#255](https://www.github.com/terraform-google-modules/terraform-google-network/issues/255)) ([8666553](https://www.github.com/terraform-google-modules/terraform-google-network/commit/8666553e0912af92e072eef9fa8c75e754af6f1b))\n+\n ### [3.1.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.1...v3.1.2) (2021-02-25)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.2.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.2.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.2...v3.2.0) (2021-03-04)\n+\n+\n+### Features\n+\n+* Add support for export_local_subnet_routes_with_public_ip and export_peer_subnet_routes_with_public_ip ([#255](https://www.github.com/terraform-google-modules/terraform-google-network/issues/255)) ([8666553](https://www.github.com/terraform-google-modules/terraform-google-network/commit/8666553e0912af92e072eef9fa8c75e754af6f1b))\n+\n ### [3.1.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.1...v3.1.2) (2021-02-25)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.2.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.2.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.2...v3.2.0) (2021-03-04)\n+\n+\n+### Features\n+\n+* Add support for export_local_subnet_routes_with_public_ip and export_peer_subnet_routes_with_public_ip ([#255](https://www.github.com/terraform-google-modules/terraform-google-network/issues/255)) ([8666553](https://www.github.com/terraform-google-modules/terraform-google-network/commit/8666553e0912af92e072eef9fa8c75e754af6f1b))\n+\n ### [3.1.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.1...v3.1.2) (2021-02-25)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform = }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.2.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+## [3.2.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.2...v3.2.0) (2021-03-04)\n+\n+\n+### Features\n+\n+* Add support for export_local_subnet_routes_with_public_ip and export_peer_subnet_routes_with_public_ip ([#255](https://www.github.com/terraform-google-modules/terraform-google-network/issues/255)) ([8666553](https://www.github.com/terraform-google-modules/terraform-google-network/commit/8666553e0912af92e072eef9fa8c75e754af6f1b))\n+\n ### [3.1.2](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v3.1.1...v3.1.2) (2021-02-25)\n \n \n---\nmodules/fabric-net-firewall/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.2.0\"\n }\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.2.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v3.2.0\"\n }\n }\n---\nmodules/network-peering/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v3.2.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v3.2.0\"\n }\n }\n---\nmodules/routes/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:routes/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v3.2.0\"\n }\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v3.2.0\"\n }\n }\n---\nmodules/subnets/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- support = \"blueprints/terraform/terraform-google-network:subnets/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v3.2.0\"\n }\n }\n---\nmodules/vpc/versions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v3.2.0\"\n }\n }\n---\nversions.tf\n@@ -24,6 +24,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network/v3.1.2\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v3.2.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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis change was needed by a customer who needs to follow naming conventions.\r\nBasically I added names for local and peer network peering and if this is set the prefix will be removed. If you want to add a prefix you have to set the name and add the prefix in front. \n\n---\n\nChoice A:\nmodules/network-peering/README.md\n@@ -53,9 +53,10 @@ module \"peering-a-c\" {\n | export\\_peer\\_custom\\_routes | Export custom routes to local network from peer network. | `bool` | `false` | no |\n | export\\_peer\\_subnet\\_routes\\_with\\_public\\_ip | Export custom routes to local network from peer network (defaults to false; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#import_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default). | `bool` | `false` | no |\n | local\\_network | Resource link of the network to add a peering to. | `string` | n/a | yes |\n+| local\\_peering\\_name | Name for the local peering | `string` | `\"\"` | no |\n | module\\_depends\\_on | List of modules or resources this module depends on. | `list(any)` | `[]` | no |\n | peer\\_network | Resource link of the peer network. | `string` | n/a | yes |\n-| prefix | Name prefix for the network peerings | `string` | `\"network-peering\"` | no |\n+| peer\\_peering\\_name | Name for the peer peering | `string` | `\"\"` | no |\n \n ## Outputs\n \n---\nmodules/network-peering/main.tf\n@@ -15,13 +15,16 @@\n */\n \n locals {\n+ default_prefix = \"network-peering\"\n+\n local_network_name = element(reverse(split(\"/\", var.local_network)), 0)\n peer_network_name = element(reverse(split(\"/\", var.peer_network)), 0)\n \n- local_network_peering = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n- local_network_peering_name = length(local.local_network_peering) < 63 ? local.local_network_peering : \"${substr(local.local_network_peering, 0, min(58, length(local.local_network_peering)))}-${random_string.network_peering_suffix.result}\"\n- peer_network_peering = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n- peer_network_peering_name = length(local.peer_network_peering) < 63 ? local.peer_network_peering : \"${substr(local.peer_network_peering, 0, min(58, length(local.peer_network_peering)))}-${random_string.network_peering_suffix.result}\"\n+ local_network_peering = \"${local.default_prefix}-${local.local_network_name}-${local.peer_network_name}\"\n+ local_peering_name = var.local_peering_name != \"\" && length(var.local_peering_name) < 63 ? var.local_peering_name : \"${substr(local.local_network_peering, 0, min(58, length(local.local_network_peering)))}-${random_string.network_peering_suffix.result}\"\n+\n+ peer_network_peering = \"${local.default_prefix}-${local.peer_network_name}-${local.local_network_name}\"\n+ peer_peering_name = var.peer_peering_name != \"\" && length(var.peer_peering_name) < 63 ? var.peer_peering_name : \"${substr(local.peer_network_peering, 0, min(58, length(local.peer_network_peering)))}-${random_string.network_peering_suffix.result}\"\n }\n \n resource \"random_string\" \"network_peering_suffix\" {\n@@ -33,7 +36,7 @@ resource \"random_string\" \"network_peering_suffix\" {\n \n resource \"google_compute_network_peering\" \"local_network_peering\" {\n provider = google-beta\n- name = local.local_network_peering_name\n+ name = local.local_peering_name\n network = var.local_network\n peer_network = var.peer_network\n export_custom_routes = var.export_local_custom_routes\n@@ -47,7 +50,7 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n provider = google-beta\n- name = local.peer_network_peering_name\n+ name = local.peer_peering_name\n network = var.peer_network\n peer_network = var.local_network\n export_custom_routes = var.export_peer_custom_routes\n---\nmodules/network-peering/variables.tf\n@@ -14,10 +14,16 @@\n * limitations under the License.\n */\n \n-variable \"prefix\" {\n- description = \"Name prefix for the network peerings\"\n+variable \"local_peering_name\" {\n+ description = \"Name for the local peering\"\n type = string\n- default = \"network-peering\"\n+ default = \"\"\n+}\n+\n+variable \"peer_peering_name\" {\n+ description = \"Name for the peer peering\"\n+ type = string\n+ default = \"\"\n }\n \n variable \"local_network\" {\n---\ntest/setup/README.md\n@@ -32,4 +32,4 @@ integration tests from your machine.\n \n Alternatively, to run the integration tests directly from the Docker\n container used by the module's CI pipeline, perform the above steps and then\n-run the `make test_integration_docker` target\n+run the `make docker_test_integration` target\n---\n\n\n---\n\nChoice B:\nmodules/network-peering/README.md\n@@ -53,9 +53,10 @@ module \"peering-a-c\" {\n | export\\_peer\\_custom\\_routes | Export custom routes to local network from peer network. | `bool` | `false` | no |\n | export\\_peer\\_subnet\\_routes\\_with\\_public\\_ip | Export custom routes to local network from peer network (defaults to false; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#import_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default). | `bool` | `false` | no |\n | local\\_network | Resource link of the network to add a peering to. | `string` | n/a | yes |\n+| local\\_peering\\_name | Name for the local peering | `string` | `\"\"` | no |\n | module\\_depends\\_on | List of modules or resources this module depends on. | `list(any)` | `[]` | no |\n | peer\\_network | Resource link of the peer network. | `string` | n/a | yes |\n-| prefix | Name prefix for the network peerings | `string` | `\"network-peering\"` | no |\n+| peer\\_peering\\_name | Name for the peer peering | `string` | `\"\"` | no |\n \n ## Outputs\n \n---\nmodules/network-peering/main.tf\n@@ -15,13 +15,16 @@\n */\n \n locals {\n+ default_prefix = \"network-peering\"\n+\n local_network_name = element(reverse(split(\"/\", var.local_network)), 0)\n peer_network_name = element(reverse(split(\"/\", var.peer_network)), 0)\n \n- local_network_peering = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n- local_network_peering_name = length(local.local_network_peering) < 63 ? local.local_network_peering : \"${substr(local.local_network_peering, 0, min(58, length(local.local_network_peering)))}-${random_string.network_peering_suffix.result}\"\n- peer_network_peering = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n- peer_network_peering_name = length(local.peer_network_peering) < 63 ? local.peer_network_peering : \"${substr(local.peer_network_peering, 0, min(58, length(local.peer_network_peering)))}-${random_string.network_peering_suffix.result}\"\n+ local_network_peering = \"${local.default_prefix}-${local.local_network_name}-${local.peer_network_name}\"\n+ local_peering_name = var.local_peering_name != \"\" && length(var.local_peering_name) < 63 ? var.local_peering_name : \"${substr(local.local_network_peering, 0, ? length(local.local_network_peering)))}-${random_string.network_peering_suffix.result}\"\n+\n+ peer_network_peering = \"${local.default_prefix}-${local.peer_network_name}-${local.local_network_name}\"\n+ peer_peering_name = var.peer_peering_name != \"\" && length(var.peer_peering_name) < 63 ? var.peer_peering_name : \"${substr(local.peer_network_peering, 0, min(58, length(local.peer_network_peering)))}-${random_string.network_peering_suffix.result}\"\n }\n \n resource \"random_string\" \"network_peering_suffix\" {\n@@ -33,7 +36,7 @@ resource \"random_string\" \"network_peering_suffix\" {\n \n resource \"google_compute_network_peering\" \"local_network_peering\" {\n provider = google-beta\n- name = local.local_network_peering_name\n+ name = local.local_peering_name\n network = var.local_network\n peer_network = var.peer_network\n export_custom_routes = var.export_local_custom_routes\n@@ -47,7 +50,7 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n provider = google-beta\n- name = local.peer_network_peering_name\n+ name = local.peer_peering_name\n network = var.peer_network\n peer_network = var.local_network\n export_custom_routes = var.export_peer_custom_routes\n---\nmodules/network-peering/variables.tf\n@@ -14,10 +14,16 @@\n * limitations under the License.\n */\n \n-variable \"prefix\" {\n- description = \"Name prefix for the network peerings\"\n+variable \"local_peering_name\" {\n+ description = \"Name for the local peering\"\n type = string\n- default = \"network-peering\"\n+ default = \"\"\n+}\n+\n+variable \"peer_peering_name\" {\n+ description = \"Name for the peer peering\"\n+ type = string\n+ default = \"\"\n }\n \n variable \"local_network\" {\n---\ntest/setup/README.md\n@@ -32,4 +32,4 @@ integration tests from your machine.\n \n Alternatively, to run the integration tests directly from the Docker\n container used by the module's CI pipeline, perform the above steps and then\n-run the `make test_integration_docker` target\n+run the `make docker_test_integration` target\n---\n\n\n---\n\nChoice C:\nmodules/network-peering/README.md\n@@ -53,9 +53,10 @@ module \"peering-a-c\" {\n | export\\_peer\\_custom\\_routes | Export custom routes to local network from peer network. | `bool` | `false` | no |\n | export\\_peer\\_subnet\\_routes\\_with\\_public\\_ip | Export custom routes to local network from peer network (defaults to false; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#import_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default). | `bool` | `false` | no |\n | local\\_network | Resource link of the network to add a peering to. | `string` | n/a | yes |\n+| local\\_peering\\_name | Name for the local peering | `string` | `\"\"` | no |\n | module\\_depends\\_on | List of modules or resources this module depends on. | `list(any)` | `[]` | no |\n | peer\\_network | Resource link of the peer network. | `string` | n/a | yes |\n-| prefix | Name prefix for the network peerings | `string` | `\"network-peering\"` | no |\n+| peer\\_peering\\_name | Name for the peer peering | `string` | `\"\"` | no |\n \n ## Outputs\n \n---\nmodules/network-peering/main.tf\n@@ -15,13 +15,16 @@\n */\n \n locals {\n+ default_prefix = \"network-peering\"\n+\n local_network_name = element(reverse(split(\"/\", var.local_network)), 0)\n peer_network_name = element(reverse(split(\"/\", var.peer_network)), 0)\n \n- local_network_peering = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n- local_network_peering_name = length(local.local_network_peering) < 63 ? local.local_network_peering : \"${substr(local.local_network_peering, 0, min(58, length(local.local_network_peering)))}-${random_string.network_peering_suffix.result}\"\n- peer_network_peering = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n- peer_network_peering_name = length(local.peer_network_peering) < 63 ? local.peer_network_peering : \"${substr(local.peer_network_peering, 0, min(58, length(local.peer_network_peering)))}-${random_string.network_peering_suffix.result}\"\n+ local_network_peering = \"${local.default_prefix}-${local.local_network_name}-${local.peer_network_name}\"\n+ local_peering_name = var.local_peering_name != \"\" && length(var.local_peering_name) < 63 ? var.local_peering_name : \"${substr(local.local_network_peering, 0, min(58, length(local.local_network_peering)))}-${random_string.network_peering_suffix.result}\"\n+\n+ peer_network_peering = \"${local.default_prefix}-${local.peer_network_name}-${local.local_network_name}\"\n+ peer_peering_name = var.peer_peering_name != \"\" && length(var.peer_peering_name) < 63 ? var.peer_peering_name : \"${substr(local.peer_network_peering, 0, min(58, length(local.peer_network_peering)))}-${random_string.network_peering_suffix.result}\"\n }\n \n resource \"random_string\" \"network_peering_suffix\" {\n@@ -33,7 +36,7 @@ resource \"random_string\" \"network_peering_suffix\" {\n \n resource \"google_compute_network_peering\" \"local_network_peering\" {\n provider = google-beta\n- name = local.local_network_peering_name\n+ name = local.local_peering_name\n network = var.local_network\n peer_network = var.peer_network\n export_custom_routes = var.export_local_custom_routes\n@@ -47,7 +50,7 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n provider = google-beta\n- name = local.peer_network_peering_name\n+ name = local.peer_peering_name\n network = var.peer_network\n peer_network = var.local_network\n export_custom_routes = var.export_peer_custom_routes\n---\nmodules/network-peering/variables.tf\n@@ -14,10 +14,16 @@\n * limitations under the License.\n */\n \n-variable \"prefix\" {\n- description = \"Name prefix for the network peerings\"\n+variable \"local_peering_name\" {\n+ description = \"Name for the local peering\"\n type = string\n- default = \"network-peering\"\n+ default = \"\"\n+}\n+\n+variable \"peer_peering_name\" {\n+ description = \"Name for the peer peering\"\n+ type = string\n+ default = \"\"\n }\n \n variable \"local_network\" {\n---\ntest/setup/README.md\n@@ -32,4 +32,4 @@ integration tests from your machine.\n \n Alternatively, to run the integration tests directly from the Docker\n container used by the module's CI pipeline, perform the above steps and then\n-run the `make test_integration_docker` target\n+run the `make docker_test_integration` target\n---\n\n\n---\n\nChoice D:\nmodules/network-peering/README.md\n@@ -53,9 +53,10 @@ module \"peering-a-c\" {\n | export\\_peer\\_custom\\_routes | Export custom routes to local network from peer network. | `bool` | `false` | no |\n | export\\_peer\\_subnet\\_routes\\_with\\_public\\_ip | Export custom routes to local network from peer network (defaults to false; causes the Local Peering Connection to align with the [provider default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#import_subnet_routes_with_public_ip), and the Remote Peering Connection to be opposite the provider default). | `bool` | `false` | no |\n | local\\_network | Resource link of the network to add a peering to. | `string` | n/a | yes |\n+| local\\_peering\\_name | Name for the local peering | `string` | `\"\"` | no |\n | module\\_depends\\_on | List of modules or resources this module depends on. | `list(any)` | `[]` | no |\n | peer\\_network | Resource link of the peer network. | `string` | n/a | yes |\n-| prefix | Name prefix for the network peerings | `string` | `\"network-peering\"` | no |\n+| peer\\_peering\\_name | Name for the peer peering | `string` | `\"\"` | no |\n \n ## Outputs\n \n---\nmodules/network-peering/main.tf\n@@ -15,13 +15,16 @@\n */\n \n locals {\n+ default_prefix = \"network-peering\"\n+\n local_network_name = element(reverse(split(\"/\", var.local_network)), 0)\n peer_network_name = element(reverse(split(\"/\", var.peer_network)), 0)\n `false` local_network_peering = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n- local_network_peering_name = length(local.local_network_peering) < 63 ? local.local_network_peering : \"${substr(local.local_network_peering, 0, min(58, length(local.local_network_peering)))}-${random_string.network_peering_suffix.result}\"\n- peer_network_peering = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n- peer_network_peering_name = length(local.peer_network_peering) < 63 ? local.peer_network_peering : \"${substr(local.peer_network_peering, 0, min(58, length(local.peer_network_peering)))}-${random_string.network_peering_suffix.result}\"\n+ local_network_peering = \"${local.default_prefix}-${local.local_network_name}-${local.peer_network_name}\"\n+ local_peering_name = var.local_peering_name != \"\" && length(var.local_peering_name) < 63 ? var.local_peering_name : \"${substr(local.local_network_peering, 0, min(58, length(local.local_network_peering)))}-${random_string.network_peering_suffix.result}\"\n+\n+ peer_network_peering = \"${local.default_prefix}-${local.peer_network_name}-${local.local_network_name}\"\n+ peer_peering_name = var.peer_peering_name != \"\" && length(var.peer_peering_name) < 63 ? var.peer_peering_name : \"${substr(local.peer_network_peering, 0, min(58, length(local.peer_network_peering)))}-${random_string.network_peering_suffix.result}\"\n }\n \n resource \"random_string\" \"network_peering_suffix\" {\n@@ -33,7 +36,7 @@ resource \"random_string\" \"network_peering_suffix\" {\n \n resource \"google_compute_network_peering\" \"local_network_peering\" {\n provider = google-beta\n- name = local.local_network_peering_name\n+ name = local.local_peering_name\n network = var.local_network\n peer_network = var.peer_network\n export_custom_routes = var.export_local_custom_routes\n@@ -47,7 +50,7 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n provider = google-beta\n- name = local.peer_network_peering_name\n+ name = local.peer_peering_name\n network = var.peer_network\n peer_network = var.local_network\n export_custom_routes = var.export_peer_custom_routes\n---\nmodules/network-peering/variables.tf\n@@ -14,10 +14,16 @@\n * limitations under the License.\n */\n \n-variable \"prefix\" {\n- description = \"Name prefix for the network peerings\"\n+variable \"local_peering_name\" {\n+ description = \"Name for the local peering\"\n type = string\n- default = \"network-peering\"\n+ default = \"\"\n+}\n+\n+variable \"peer_peering_name\" {\n+ description = \"Name for the peer peering\"\n+ type = string\n+ default = \"\"\n }\n \n variable \"local_network\" {\n---\ntest/setup/README.md\n@@ -32,4 +32,4 @@ integration tests from your machine.\n \n Alternatively, to run the integration tests directly from the Docker\n container used by the module's CI pipeline, perform the above steps and then\n-run the `make test_integration_docker` target\n+run the `make docker_test_integration` target\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nIt's a good practice and terragrunt does not work properly without it.\n\n---\n\nChoice A:\nmodules/fabric-net-firewall/variables.tf\n@@ -16,53 +16,67 @@\n \n variable \"network\" {\n description = \"Name of the network this set of firewall rules applies to.\"\n+ type = string\n }\n \n variable \"project_id\" {\n description = \"Project id of the project that holds the network.\"\n+ type = string\n }\n \n variable \"internal_ranges_enabled\" {\n description = \"Create rules for intra-VPC ranges.\"\n+ type = bool\n default = false\n }\n \n variable \"internal_ranges\" {\n description = \"IP CIDR ranges for intra-VPC rules.\"\n+ type = list(string)\n default = []\n }\n \n variable \"internal_allow\" {\n description = \"Allow rules for internal ranges.\"\n+ type = list(object({\n+ protocol = string\n+ ports = list(string)\n+ }))\n default = [\n {\n protocol = \"icmp\"\n+ ports = []\n },\n ]\n }\n \n variable \"admin_ranges_enabled\" {\n description = \"Enable admin ranges-based rules.\"\n+ type = bool\n default = false\n }\n \n variable \"admin_ranges\" {\n description = \"IP CIDR ranges that have complete access to all subnets.\"\n+ type = list(string)\n default = []\n }\n \n variable \"ssh_source_ranges\" {\n description = \"List of IP CIDR ranges {\n tag-based SSH rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-firewall/variables.tf\n@@ -16,53 +16,67 @@\n \n variable \"network\" {\n description = \"Name of the network this set of firewall rules applies to.\"\n+ type = string\n }\n \n variable \"project_id\" {\n description = \"Project id of the project that holds the network.\"\n+ type = string\n }\n \n variable \"internal_ranges_enabled\" {\n description = \"Create rules for intra-VPC ranges.\"\n+ type = bool\n default = false\n }\n \n variable \"internal_ranges\" {\n description = \"IP CIDR ranges for intra-VPC rules.\"\n+ type = list(string)\n default = []\n }\n \n variable \"internal_allow\" {\n description = \"Allow rules for internal ranges.\"\n+ type = list(object({\n+ protocol = string\n+ ports = list(string)\n+ }))\n default = [\n {\n protocol = \"icmp\"\n+ ports = []\n },\n ]\n }\n \n variable \"admin_ranges_enabled\" {\n description = \"Enable admin ranges-based rules.\"\n+ type = bool\n default = false\n }\n \n variable \"admin_ranges\" {\n description = \"IP CIDR ranges that have complete access to all subnets.\"\n+ type = list(string)\n default = []\n }\n \n variable \"ssh_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-firewall/variables.tf\n@@ -16,53 +16,67 @@\n \n variable \"network\" {\n description = \"Name of the network this set of firewall rules applies to.\"\n+ type = string\n }\n \n variable \"project_id\" {\n description = \"Project id of the project that holds the network.\"\n+ type = string\n }\n \n variable \"internal_ranges_enabled\" {\n description = \"Create rules for intra-VPC ranges.\"\n+ type = bool\n default = false\n }\n \n variable \"internal_ranges\" {\n description = \"IP CIDR ranges for intra-VPC rules.\"\n+ type = list(string)\n default = []\n }\n \n variable \"internal_allow\" {\n description = \"Allow rules for internal ranges.\"\n+ type = list(object({\n+ protocol = string\n+ ports = list(string)\n+ }))\n default = [\n {\n protocol = \"icmp\"\n+ ports = []\n },\n ]\n }\n default variable \"admin_ranges_enabled\" {\n description = \"Enable admin ranges-based rules.\"\n+ type = bool\n default = false\n }\n \n variable \"admin_ranges\" {\n description = \"IP CIDR ranges that have complete access to all subnets.\"\n+ type = list(string)\n default = []\n }\n \n variable \"ssh_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-firewall/variables.tf\n@@ -16,53 +16,67 @@\n \n variable \"network\" {\n description = \"Name of the network this set of firewall rules applies to.\"\n+ type = string\n }\n \n variable \"project_id\" {\n description = \"Project id of the variable that holds the network.\"\n+ type = string\n }\n \n variable \"internal_ranges_enabled\" {\n description = \"Create rules for intra-VPC ranges.\"\n+ type = bool\n default = false\n }\n \n variable \"internal_ranges\" {\n description = \"IP CIDR ranges for intra-VPC rules.\"\n+ type = list(string)\n default = []\n }\n \n variable \"internal_allow\" {\n description = \"Allow rules for internal ranges.\"\n+ type = list(object({\n+ protocol = string\n+ ports = list(string)\n+ }))\n default = [\n {\n protocol = \"icmp\"\n+ ports = []\n },\n ]\n }\n \n variable \"admin_ranges_enabled\" {\n description = \"Enable admin ranges-based rules.\"\n+ type = bool\n default = false\n }\n \n variable \"admin_ranges\" {\n description = \"IP CIDR ranges that have complete access to all subnets.\"\n+ type = list(string)\n default = []\n }\n \n variable \"ssh_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR explicits the variables type for various ranges.\r\n\r\nIt fixes #157 \n\n---\n\nChoice A:\nmodules/fabric-net-firewall/variables.tf\n@@ -53,16 +53,19 @@ variable \"admin_ranges\" {\n \n variable \"ssh_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0.\"\n+ type = set(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n+ type = set(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n+ type = set(string)\n default = [\"0.0.0.0/0\"]\n }\n \n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-firewall/variables.tf\n@@ -53,16 +53,19 @@ variable \"admin_ranges\" {\n \n variable \"ssh_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0.\"\n+ for type = set(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n+ type = set(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n+ type = set(string)\n default = [\"0.0.0.0/0\"]\n }\n \n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-firewall/variables.tf\n@@ -53,16 +53,19 @@ variable \"admin_ranges\" {\n \n variable \"ssh_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0.\"\n+ type = set(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n+ type = set(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n+ type = set(string)\n default = [\"0.0.0.0/0\"]\n }\n \n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-firewall/variables.tf\n@@ -53,16 +53,19 @@ variable \"admin_ranges\" {\n \n variable \"ssh_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0.\"\n+ type = set(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n+ type }\n = set(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n+ type = set(string)\n default = [\"0.0.0.0/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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR adds the ability to specify the target_tags attribute for the default firewalls, rather than having them hardcoded within the code\n\n---\n\nChoice A:\nmodules/fabric-net-firewall/README.md\n@@ -29,9 +29,9 @@ The resources created/managed by this module are:\n \n - one optional ingress rule from internal CIDR ranges, only allowing ICMP by default\n - one optional ingress rule from admin CIDR ranges, allowing all protocols on all ports\n-- one optional ingress rule for SSH on network tag `ssh`\n-- one optional ingress rule for HTTP on network tag `http-server`\n-- one optional ingress rule for HTTPS on network tag `https-server`\n+- one optional ingress rule for SSH on network tag `ssh` by default\n+- one optional ingress rule for HTTP on network tag `http-server` by default\n+- one optional ingress rule for HTTPS on network tag `https-server` by default\n - one or more optional custom rules\n \n \n@@ -46,6 +46,7 @@ module \"net-firewall\" {\n network = \"my-vpc\"\n internal_ranges_enabled = true\n internal_ranges = [\"10.0.0.0/0\"]\n+ internal_target_tags = [\"internal\"]\n custom_rules = {\n ingress-sample = {\n description = \"Dummy sample ingress rule, tag-based.\"\n@@ -76,13 +77,17 @@ module \"net-firewall\" {\n | admin\\_ranges\\_enabled | Enable admin ranges-based rules. | string | `\"false\"` | no |\n | custom\\_rules | List of custom rule definitions (refer to variables file for syntax). | object | `<map>` | no |\n | http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n+| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | list | `<list>` | no |\n | https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n+| https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | list | `<list>` | no |\n | internal\\_allow | Allow rules for internal ranges. | list | `<list>` | no |\n | internal\\_ranges | IP CIDR ranges for intra-VPC rules. | list | `<list>` | no |\n | internal\\_ranges\\_enabled | Create rules for intra-VPC ranges. | string | `\"false\"` | no |\n+| internal\\_target\\_tags | List of target tags for intra-VPC rules. | list | `<list>` | no |\n | network | Name of the network this set of firewall rules applies to. | string | n/a | yes |\n | project\\_id | Project id of the project that holds the network. | string | n/a | yes |\n | ssh\\_source\\_ranges | List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n+| ssh\\_target\\_tags | List of target tags for tag-based SSH rule, defaults to ssh. | list | `<list>` | no |\n \n ## Outputs\n \n---\nmodules/fabric-net-firewall/main.tf\n@@ -25,6 +25,7 @@ resource \"google_compute_firewall\" \"allow-internal\" {\n network = var.network\n project = var.project_id\n source_ranges = var.internal_ranges\n+ target_tags = var.internal_target_tags\n \n dynamic \"allow\" {\n for_each = [for rule in var.internal_allow :\n@@ -38,13 +39,8 @@ resource \"google_compute_firewall\" \"allow-internal\" {\n ports = allow.value.ports\n }\n }\n-\n }\n \n-\n-\n-\n-\n resource \"google_compute_firewall\" \"allow-admins\" {\n count = var.admin_ranges_enabled == true ? 1 : 0\n name = \"${var.network}-ingress-admins\"\n@@ -77,7 +73,7 @@ resource \"google_compute_firewall\" \"allow-tag-ssh\" {\n network = var.network\n project = var.project_id\n source_ranges = var.ssh_source_ranges\n- target_tags = [\"ssh\"]\n+ target_tags = var.ssh_target_tags\n \n allow {\n protocol = \"tcp\"\n@@ -92,7 +88,7 @@ resource \"google_compute_firewall\" \"allow-tag-http\" {\n network = var.network\n project = var.project_id\n source_ranges = var.http_source_ranges\n- target_tags = [\"http-server\"]\n+ target_tags = var.http_target_tags\n \n allow {\n protocol = \"tcp\"\n@@ -107,7 +103,7 @@ resource \"google_compute_firewall\" \"allow-tag-https\" {\n network = var.network\n project = var.project_id\n source_ranges = var.https_source_ranges\n- target_tags = [\"https-server\"]\n+ target_tags = var.https_target_tags\n \n allow {\n protocol = \"tcp\"\n---\nmodules/fabric-net-firewall/variables.tf\n@@ -32,6 +32,11 @@ variable \"internal_ranges\" {\n default = []\n }\n \n+variable \"internal_target_tags\" {\n+ description = \"List of target tags for intra-VPC rules.\"\n+ default = []\n+}\n+\n variable \"internal_allow\" {\n description = \"Allow rules for internal ranges.\"\n default = [\n@@ -56,16 +61,31 @@ variable \"ssh_source_ranges\" {\n default = [\"0.0.0.0/0\"]\n }\n \n+variable \"ssh_target_tags\" {\n+ description = \"List of target tags for tag-based SSH rule, defaults to ssh.\"\n+ default = [\"ssh\"]\n+}\n+\n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n default = [\"0.0.0.0/0\"]\n }\n \n+variable \"http_target_tags\" {\n+ description = \"List of target tags for tag-based HTTP rule, defaults to http-server.\"\n+ default = [\"http-server\"]\n+}\n+\n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n default = [\"0.0.0.0/0\"]\n }\n \n+variable \"https_target_tags\" {\n+ description = \"List of target tags for tag-based HTTPS rule, defaults to https-server.\"\n+ default = [\"https-server\"]\n+}\n+\n variable \"custom_rules\" {\n description = \"List of custom rule definitions (refer to variables file for syntax).\"\n default = {}\n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-firewall/README.md\n@@ -29,9 +29,9 @@ The resources created/managed by this module are:\n \n - one optional ingress rule from internal CIDR ranges, only allowing ICMP by default\n - one optional ingress rule from admin CIDR ranges, allowing all protocols on all ports\n-- one optional ingress rule for SSH on network tag `ssh`\n-- one optional ingress rule for HTTP on network tag `http-server`\n-- one optional ingress rule for HTTPS on network tag `https-server`\n+- one optional ingress rule for SSH on network tag `ssh` by default\n+- one optional ingress rule for HTTP on network tag `http-server` by default\n+- one optional ingress rule for HTTPS on network tag `https-server` by default\n - one or more optional custom rules\n \n \n@@ -46,6 +46,7 @@ module \"net-firewall\" {\n network = \"my-vpc\"\n internal_ranges_enabled = true\n internal_ranges = [\"10.0.0.0/0\"]\n+ internal_target_tags = [\"internal\"]\n custom_rules = {\n ingress-sample = {\n description = \"Dummy sample ingress rule, tag-based.\"\n@@ -76,13 +77,17 @@ module \"net-firewall\" {\n | admin\\_ranges\\_enabled | Enable admin ranges-based rules. | string | `\"false\"` | no |\n | custom\\_rules | List of custom rule definitions (refer to variables file for syntax). | object | `<map>` | no |\n | http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n+| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | list | `<list>` | no |\n | https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n+| https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | list | `<list>` | no |\n | internal\\_allow | Allow rules for internal ranges. | list | `<list>` | no |\n | internal\\_ranges | IP CIDR ranges for intra-VPC rules. | list | `<list>` | no |\n | internal\\_ranges\\_enabled | Create rules for intra-VPC ranges. | string | `\"false\"` | no |\n+| internal\\_target\\_tags | List of target tags for intra-VPC rules. | list | `<list>` | no |\n | network | Name of the network this set of firewall rules applies to. | string | n/a | yes |\n | project\\_id | Project id of the project that holds the network. | string | n/a | yes |\n | ssh\\_source\\_ranges | List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n+| ssh\\_target\\_tags | List of target tags for tag-based SSH rule, defaults to ssh. | list | `<list>` | no |\n \n ## Outputs\n \n---\nmodules/fabric-net-firewall/main.tf\n@@ -25,6 +25,7 @@ resource \"google_compute_firewall\" \"allow-internal\" {\n network = var.network\n project = var.project_id\n source_ranges = var.internal_ranges\n+ target_tags = var.internal_target_tags\n \n dynamic \"allow\" {\n for_each = [for rule in var.internal_allow :\n@@ -38,13 +39,8 @@ resource \"google_compute_firewall\" \"allow-internal\" {\n ports = allow.value.ports\n }\n }\n-\n }\n \n-\n-\n-\n-\n resource \"google_compute_firewall\" \"allow-admins\" {\n count = var.admin_ranges_enabled == true ? 1 : 0\n name = \"${var.network}-ingress-admins\"\n@@ -77,7 +73,7 @@ resource \"google_compute_firewall\" \"allow-tag-ssh\" {\n network = var.network\n project = var.project_id\n source_ranges = var.ssh_source_ranges\n- target_tags = [\"ssh\"]\n+ target_tags = var.ssh_target_tags\n \n allow {\n protocol = \"tcp\"\n@@ -92,7 +88,7 @@ resource \"google_compute_firewall\" \"allow-tag-http\" {\n network = var.network\n project = var.project_id\n source_ranges = var.http_source_ranges\n- target_tags = [\"http-server\"]\n+ target_tags = var.http_target_tags\n \n allow {\n protocol = \"tcp\"\n@@ -107,7 +103,7 @@ resource \"google_compute_firewall\" \"allow-tag-https\" {\n network = var.network\n project = var.project_id\n source_ranges = var.https_source_ranges\n- target_tags = [\"https-server\"]\n+ target_tags = var.https_target_tags\n \n allow {\n protocol = \"tcp\"\n---\nmodules/fabric-net-firewall/variables.tf\n@@ -32,6 +32,11 @@ variable \"internal_ranges\" {\n default = []\n }\n \n+variable \"internal_target_tags\" {\n+ description = \"List of target tags for intra-VPC rules.\"\n+ default = []\n+}\n+\n variable \"internal_allow\" {\n description = \"Allow rules for internal ranges.\"\n default = [\n@@ -56,16 +61,31 @@ variable \"ssh_source_ranges\" {\n default = [\"0.0.0.0/0\"]\n }\n \n+variable \"ssh_target_tags\" {\n+ description = \"List of target tags for tag-based SSH rule, defaults to ssh.\"\n+ default = [\"ssh\"]\n+}\n+\n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n default = [\"0.0.0.0/0\"]\n }\n \n+variable \"http_target_tags\" {\n+ description = \"List of target tags for tag-based HTTP rule, defaults to http-server.\"\n+ default = [\"http-server\"]\n+}\n+\n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n default = [\"0.0.0.0/0\"]\n }\n \n+variable \"https_target_tags\" {\n+ description = \"List of target tags for tag-based HTTPS rule, defaults to https-server.\"\n+ default = [\"https-server\"]\n+}\n+\n variable \"custom_rules\" {\n description = \"List of custom rule definitions (refer to variables file for syntax).\"\n default = {}\n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-firewall/README.md\n@@ -29,9 +29,9 @@ The resources created/managed by this module are:\n = - one optional ingress rule from internal CIDR ranges, only allowing ICMP by default\n - one optional ingress rule from admin CIDR ranges, allowing all protocols on all ports\n-- one optional ingress rule for SSH on network tag `ssh`\n-- one optional ingress rule for HTTP on network tag `http-server`\n-- one optional ingress rule for HTTPS on network tag `https-server`\n+- one optional ingress rule for SSH on network tag `ssh` by default\n+- one optional ingress rule for HTTP on network tag `http-server` by default\n+- one optional ingress rule for HTTPS on network tag `https-server` by default\n - one or more optional custom rules\n \n \n@@ -46,6 +46,7 @@ module \"net-firewall\" {\n network = \"my-vpc\"\n internal_ranges_enabled = true\n internal_ranges = [\"10.0.0.0/0\"]\n+ internal_target_tags = [\"internal\"]\n custom_rules = {\n ingress-sample = {\n description = \"Dummy sample ingress rule, tag-based.\"\n@@ -76,13 +77,17 @@ module \"net-firewall\" {\n | admin\\_ranges\\_enabled | Enable admin ranges-based rules. | string | `\"false\"` | no |\n | custom\\_rules | List of custom rule definitions (refer to variables file for syntax). | object | `<map>` | no |\n | http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n+| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | list | `<list>` | no |\n | https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n+| https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | list | `<list>` | no |\n | internal\\_allow | Allow rules for internal ranges. | list | `<list>` | no |\n | internal\\_ranges | IP CIDR ranges for intra-VPC rules. | list | `<list>` | no |\n | internal\\_ranges\\_enabled | Create rules for intra-VPC ranges. | string | `\"false\"` | no |\n+| internal\\_target\\_tags | List of target tags for intra-VPC rules. | list | `<list>` | no |\n | network | Name of the network this set of firewall rules applies to. | string | n/a | yes |\n | project\\_id | Project id of the project that holds the network. | string | n/a | yes |\n | ssh\\_source\\_ranges | List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n+| ssh\\_target\\_tags | List of target tags for tag-based SSH rule, defaults to ssh. | list | `<list>` | no |\n \n ## Outputs\n \n---\nmodules/fabric-net-firewall/main.tf\n@@ -25,6 +25,7 @@ resource \"google_compute_firewall\" \"allow-internal\" {\n network = var.network\n project = var.project_id\n source_ranges = var.internal_ranges\n+ target_tags = var.internal_target_tags\n \n dynamic \"allow\" {\n for_each = [for rule in var.internal_allow :\n@@ -38,13 +39,8 @@ resource \"google_compute_firewall\" \"allow-internal\" {\n ports = allow.value.ports\n }\n }\n-\n }\n \n-\n-\n-\n-\n resource \"google_compute_firewall\" \"allow-admins\" {\n count = var.admin_ranges_enabled == true ? 1 : 0\n name = \"${var.network}-ingress-admins\"\n@@ -77,7 +73,7 @@ resource \"google_compute_firewall\" \"allow-tag-ssh\" {\n network = var.network\n project = var.project_id\n source_ranges = var.ssh_source_ranges\n- target_tags = [\"ssh\"]\n+ target_tags = var.ssh_target_tags\n \n allow {\n protocol = \"tcp\"\n@@ -92,7 +88,7 @@ resource \"google_compute_firewall\" \"allow-tag-http\" {\n network = var.network\n project = var.project_id\n source_ranges = var.http_source_ranges\n- target_tags = [\"http-server\"]\n+ target_tags = var.http_target_tags\n \n allow {\n protocol = \"tcp\"\n@@ -107,7 +103,7 @@ resource \"google_compute_firewall\" \"allow-tag-https\" {\n network = var.network\n project = var.project_id\n source_ranges = var.https_source_ranges\n- target_tags = [\"https-server\"]\n+ target_tags = var.https_target_tags\n \n allow {\n protocol = \"tcp\"\n---\nmodules/fabric-net-firewall/variables.tf\n@@ -32,6 +32,11 @@ variable \"internal_ranges\" {\n default = []\n }\n \n+variable \"internal_target_tags\" {\n+ description = \"List of target tags for intra-VPC rules.\"\n+ default = []\n+}\n+\n variable \"internal_allow\" {\n description = \"Allow rules for internal ranges.\"\n default = [\n@@ -56,16 +61,31 @@ variable \"ssh_source_ranges\" {\n default = [\"0.0.0.0/0\"]\n }\n \n+variable \"ssh_target_tags\" {\n+ description = \"List of target tags for tag-based SSH rule, defaults to ssh.\"\n+ default = [\"ssh\"]\n+}\n+\n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n default = [\"0.0.0.0/0\"]\n }\n \n+variable \"http_target_tags\" {\n+ description = \"List of target tags for tag-based HTTP rule, defaults to http-server.\"\n+ default = [\"http-server\"]\n+}\n+\n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n default = [\"0.0.0.0/0\"]\n }\n \n+variable \"https_target_tags\" {\n+ description = \"List of target tags for tag-based HTTPS rule, defaults to https-server.\"\n+ default = [\"https-server\"]\n+}\n+\n variable \"custom_rules\" {\n description = \"List of custom rule definitions (refer to variables file for syntax).\"\n default = {}\n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-firewall/README.md\n@@ -29,9 +29,9 @@ The resources created/managed by this module are:\n \n - one optional ingress rule from internal CIDR ranges, only allowing ICMP by default\n - one optional ingress rule from admin CIDR ranges, allowing all protocols on all ports\n-- one optional ingress rule for SSH on network tag `ssh`\n-- one optional ingress rule for HTTP on network tag `http-server`\n-- one optional ingress rule for HTTPS on network tag `https-server`\n+- one optional ingress rule for SSH on network tag `ssh` by default\n+- one optional ingress rule for HTTP on network tag `http-server` by default\n+- one optional ingress rule for HTTPS on network tag `https-server` by default\n - one or more optional custom rules\n \n \n@@ -46,6 +46,7 @@ module \"net-firewall\" {\n network = \"my-vpc\"\n internal_ranges_enabled = true\n internal_ranges = [\"10.0.0.0/0\"]\n+ internal_target_tags = [\"internal\"]\n custom_rules = {\n ingress-sample = {\n description = \"Dummy sample ingress rule, tag-based.\"\n@@ -76,13 +77,17 @@ module \"net-firewall\" {\n | admin\\_ranges\\_enabled | Enable admin ranges-based rules. | string | `\"false\"` | no |\n | custom\\_rules | List of custom rule definitions (refer to variables file for syntax). | object | `<map>` | no |\n | http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n+| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | list | `<list>` | no |\n | https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n+| https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | list | `<list>` | no |\n | internal\\_allow | Allow rules for internal ranges. | list | `<list>` | no |\n | internal\\_ranges | IP CIDR ranges for intra-VPC rules. | list | `<list>` | no |\n | internal\\_ranges\\_enabled | Create rules for intra-VPC ranges. | string | `\"false\"` | no |\n+| internal\\_target\\_tags | List of target tags for intra-VPC rules. | list | `<list>` | no |\n | network | Name of the network this set of firewall rules applies to. | string | n/a | yes |\n | project\\_id | Project id of the project that holds the network. | string | n/a | yes |\n | ssh\\_source\\_ranges | List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n+| ssh\\_target\\_tags | List of target tags for tag-based SSH rule, defaults to ssh. | list | `<list>` | no |\n \n ## Outputs\n \n---\nmodules/fabric-net-firewall/main.tf\n@@ -25,6 +25,7 @@ resource \"google_compute_firewall\" \"allow-internal\" {\n network = var.network\n project = var.project_id\n source_ranges = var.internal_ranges\n+ target_tags = var.internal_target_tags\n \n dynamic \"allow\" {\n for_each = [for rule in var.internal_allow :\n@@ -38,13 +39,8 @@ resource \"google_compute_firewall\" \"allow-internal\" {\n ports = allow.value.ports\n }\n }\n-\n }\n \n-\n-\n-\n-\n resource \"google_compute_firewall\" \"allow-admins\" {\n count = var.admin_ranges_enabled == true ? 1 : 0\n name = \"${var.network}-ingress-admins\"\n@@ -77,7 +73,7 @@ resource \"google_compute_firewall\" \"allow-tag-ssh\" {\n network = var.network\n project = var.project_id\n source_ranges = var.ssh_source_ranges\n- target_tags = [\"ssh\"]\n+ target_tags = var.ssh_target_tags\n \n allow {\n protocol = \"tcp\"\n@@ -92,7 +88,7 @@ resource \"google_compute_firewall\" \"allow-tag-http\" {\n network = var.network\n project = var.project_id\n }\n-\n = var.http_source_ranges\n- target_tags = [\"http-server\"]\n+ target_tags = var.http_target_tags\n \n allow {\n protocol = \"tcp\"\n@@ -107,7 +103,7 @@ resource \"google_compute_firewall\" \"allow-tag-https\" {\n network = var.network\n project = var.project_id\n source_ranges = var.https_source_ranges\n- target_tags = [\"https-server\"]\n+ target_tags = var.https_target_tags\n \n allow {\n protocol = \"tcp\"\n---\nmodules/fabric-net-firewall/variables.tf\n@@ -32,6 +32,11 @@ variable \"internal_ranges\" {\n default = []\n }\n \n+variable \"internal_target_tags\" {\n+ description = \"List of target tags for intra-VPC rules.\"\n+ default = []\n+}\n+\n variable \"internal_allow\" {\n description = \"Allow rules for internal ranges.\"\n default = [\n@@ -56,16 +61,31 @@ variable \"ssh_source_ranges\" {\n default = [\"0.0.0.0/0\"]\n }\n \n+variable \"ssh_target_tags\" {\n+ description = \"List of target tags for tag-based SSH rule, defaults to ssh.\"\n+ default = [\"ssh\"]\n+}\n+\n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n default = [\"0.0.0.0/0\"]\n }\n \n+variable \"http_target_tags\" {\n+ description = \"List of target tags for tag-based HTTP rule, defaults to http-server.\"\n+ default = [\"http-server\"]\n+}\n+\n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n default = [\"0.0.0.0/0\"]\n }\n \n+variable \"https_target_tags\" {\n+ description = \"List of target tags for tag-based HTTPS rule, defaults to https-server.\"\n+ default = [\"https-server\"]\n+}\n+\n variable \"custom_rules\" {\n description = \"List of custom rule definitions (refer to variables file for syntax).\"\n default = {}\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n\n\n---\n\nChoice A:\nmodules/network-peering/README.md\n@@ -13,7 +13,7 @@ Basic usage of this module is as follows:\n \n module \"peering\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google//modules/network-peering\"\n \n prefix = \"name-prefix\"\n local_network = \"<FIRST NETWORK SELF LINK>\"\n@@ -25,15 +25,15 @@ If you need to create more than one peering for the same VPC Network `(A -> B, A\n \n ```hcl\n module \"peering-a-b\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google//modules/network-peering\"\n \n prefix = \"name-prefix\"\n local_network = \"<A NETWORK SELF LINK>\"\n peer_network = \"<B NETWORK SELF LINK>\"\n }\n \n module \"peering-a-c\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google//modules/network-peering\"\n \n prefix = \"name-prefix\"\n local_network = \"<A NETWORK SELF LINK>\"\n---\n\n\n---\n\nChoice B:\nmodules/network-peering/README.md\n@@ -13,7 +13,7 @@ Basic usage of this module is as follows:\n \n ```hcl\n module \"peering\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google//modules/network-peering\"\n \n prefix = \"name-prefix\"\n local_network = \"<FIRST NETWORK SELF LINK>\"\n@@ -25,15 +25,15 @@ If you need to create more than one peering for the same VPC Network `(A -> B, A\n \n ```hcl\n module \"peering-a-b\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google//modules/network-peering\"\n \n prefix = \"name-prefix\"\n local_network = \"<A NETWORK SELF LINK>\"\n peer_network = \"<B NETWORK SELF LINK>\"\n }\n \n module \"peering-a-c\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google//modules/network-peering\"\n \n prefix = \"name-prefix\"\n local_network = \"<A NETWORK SELF LINK>\"\n---\n\n\n---\n\nChoice C:\nmodules/network-peering/README.md\n@@ -13,7 +13,7 @@ Basic usage of this module is as follows:\n \n ```hcl\n module \"peering\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google//modules/network-peering\"\n \n prefix = \"name-prefix\"\n local_network = \"<FIRST NETWORK SELF LINK>\"\n@@ -25,15 +25,15 @@ If you need to create more than one peering for the same VPC Network `(A -> B, A\n \n ```hcl\n module \"peering-a-b\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google//modules/network-peering\"\n \n prefix = \"name-prefix\"\n local_network = \"<A NETWORK SELF LINK>\"\n peer_network = \"<B NETWORK SELF LINK>\"\n }\n \n module \"peering-a-c\" {\n- {\n- = \"terraform-google-modules/terraform-google-network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google//modules/network-peering\"\n \n prefix = \"name-prefix\"\n local_network = \"<A NETWORK SELF LINK>\"\n---\n\n\n---\n\nChoice D:\nmodules/network-peering/README.md\n@@ -13,7 +13,7 @@ Basic usage of this module is as follows:\n \n ```hcl\n module \"peering\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/network-peering\"\n+ source = VPC \n prefix = \"name-prefix\"\n local_network = \"<FIRST NETWORK SELF LINK>\"\n@@ -25,15 +25,15 @@ If you need to create more than one peering for the same VPC Network `(A -> B, A\n \n ```hcl\n module \"peering-a-b\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google//modules/network-peering\"\n \n prefix = \"name-prefix\"\n local_network = \"<A NETWORK SELF LINK>\"\n peer_network = \"<B NETWORK SELF LINK>\"\n }\n \n module \"peering-a-c\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/network-peering\"\n+ source = \"terraform-google-modules/network/google//modules/network-peering\"\n \n prefix = \"name-prefix\"\n local_network = \"<A NETWORK SELF LINK>\"\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nFix #182 \n\n---\n\nChoice A:\nmodules/network-peering/main.tf\n@@ -20,7 +20,7 @@ locals = }\n \n resource \"google_compute_network_peering\" \"local_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google-beta\n name = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n network = var.local_network\n peer_network = var.peer_network\n@@ -31,7 +31,7 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n }\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google-beta\n name = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n network = var.peer_network\n peer_network = var.local_network\n---\n\n\n---\n\nChoice B:\nmodules/network-peering/main.tf\n@@ -20,7 +20,7 @@ locals {\n }\n \n resource \"google_compute_network_peering\" \"local_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google-beta\n name = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n network = var.local_network\n peer_network = var.peer_network\n@@ -31,7 +31,7 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n }\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google-beta\n name = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n network = var.peer_network\n peer_network = var.local_network\n---\n\n\n---\n\nChoice C:\nmodules/network-peering/main.tf\n@@ -20,7 +20,7 @@ locals {\n }\n \n resource \"google_compute_network_peering\" \"local_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google-beta\n name = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n network = var.local_network\n peer_network = var.peer_network\n@@ -31,7 +31,7 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n }\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google-beta\n name = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n network = var.peer_network\n peer_network = var.local_network\n---\n\n\n---\n\nChoice D:\nmodules/network-peering/main.tf\n@@ -20,7 +20,7 @@ locals {\n }\n \n resource \"google_compute_network_peering\" \"local_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google-beta\n name = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n network = var.local_network\n peer_network = var.peer_network\n@@ -31,7 +31,7 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n }\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google-beta\n name = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n network = var.peer_network\n peer_network = var.local_network\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nIt's a good practice and terragrunt does not work properly without it.\n\n---\n\nChoice A:\nmodules/fabric-net-svpc-access/README.md\n@@ -41,13 +41,13 @@ module \"net-shared-vpc-access\" {\n | Name | Description | Type | Default | Required |\n |------|-------------|:----:|:-----:|:-----:|\n | host\\_project\\_id | Project id of the shared VPC host project. | string | n/a | yes |\n-| host\\_service\\_agent\\_role | Assign host service agent role to users in host_service_agent_users variable. | string | `\"false\"` | no |\n-| host\\_service\\_agent\\_users | List of IAM-style users that will be granted the host service agent role on the host project. | list | `<list>` | no |\n-| host\\_subnet\\_regions | List of subnet regions, one per subnet. | list | `<list>` | no |\n-| host\\_subnet\\_users | Map of comma-delimited IAM-style members to which network user roles for subnets will be assigned. | map | `<map>` | no |\n-| host\\_subnets | List of subnet names on which to grant network user role. | list | `<list>` | no |\n+| host\\_service\\_agent\\_role | Assign host service agent role to users in host_service_agent_users variable. | bool | `\"false\"` | no |\n+| host\\_service\\_agent\\_users | List of IAM-style users that will be granted the host service agent role on the host project. | list(string) | `<list>` | no |\n+| host\\_subnet\\_regions | List of subnet regions, one per subnet. | list(string) | `<list>` | no |\n+| host\\_subnet\\_users | Map of comma-delimited IAM-style members to which network user roles for subnets will be assigned. | map(any) | `<map>` | no |\n+| host\\_subnets | List of subnet names on which to grant network user role. | list(string) | `<list>` | no |\n | service\\_project\\_ids | Ids of the service projects that will be attached = the Shared VPC. | list(string) | n/a | yes |\n-| service\\_project\\_num | Number of service projects that will be attached to the Shared VPC. | string | `\"0\"` | no |\n+| service\\_project\\_num | Number of service projects that will be attached to the Shared VPC. | number | `\"0\"` | no |\n \n ## Outputs\n \n---\nmodules/fabric-net-svpc-access/variables.tf\n@@ -15,42 +15,49 @@\n */\n \n variable \"host_project_id\" {\n+ type = string\n description = \"Project id of the shared VPC host project.\"\n }\n \n # passed-in values can be dynamic, so variables used in count need to be separate\n \n variable \"service_project_num\" {\n+ type = number\n description = \"Number of service projects that will be attached to the Shared VPC.\"\n default = 0\n }\n \n variable \"service_project_ids\" {\n- description = \"Ids of the service projects that will be attached to the Shared VPC.\"\n type = list(string)\n+ description = \"Ids of the service projects that will be attached to the Shared VPC.\"\n }\n \n variable \"host_subnets\" {\n+ type = list(string)\n description = \"List of subnet names on which to grant network user role.\"\n default = []\n }\n \n variable \"host_subnet_regions\" {\n+ type = list(string)\n description = \"List of subnet regions, one per subnet.\"\n default = []\n }\n \n variable \"host_subnet_users\" {\n+ type = map(any)\n description = \"Map of comma-delimited IAM-style members to which network user roles for subnets will be assigned.\"\n default = {}\n }\n \n variable \"host_service_agent_role\" {\n+ type = bool\n description = \"Assign host service agent role to users in host_service_agent_users variable.\"\n default = false\n }\n \n variable \"host_service_agent_users\" {\n+ type = list(string)\n description = \"List of IAM-style users that will be granted the host service agent role on the host project.\"\n default = []\n }\n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-svpc-access/README.md\n@@ -41,13 +41,13 @@ module \"net-shared-vpc-access\" {\n | Name | Description | Type | Default | Required |\n |------|-------------|:----:|:-----:|:-----:|\n | host\\_project\\_id | Project id of the shared VPC host project. | string | n/a | yes |\n-| host\\_service\\_agent\\_role | Assign host service agent role to users in host_service_agent_users variable. | string | `\"false\"` | no |\n-| host\\_service\\_agent\\_users | List of IAM-style users that will be granted the host service agent role on the host project. | list | `<list>` | no |\n-| host\\_subnet\\_regions | List of subnet regions, one per subnet. | list | `<list>` | no |\n-| host\\_subnet\\_users | Map of comma-delimited IAM-style members to which network user roles for subnets will be assigned. | map | `<map>` | no |\n-| host\\_subnets | List of subnet names on which to grant network user role. | list | `<list>` | no |\n+| host\\_service\\_agent\\_role | Assign host service agent role to users in host_service_agent_users variable. | bool | `\"false\"` | no |\n+| host\\_service\\_agent\\_users | List of IAM-style users that will be granted the host service agent role on the host project. | list(string) | `<list>` | no |\n+| host\\_subnet\\_regions | List of subnet regions, one per subnet. | list(string) | `<list>` | no |\n+| host\\_subnet\\_users | Map of comma-delimited IAM-style members to which network user roles for subnets will be assigned. | map(any) | `<map>` | no |\n+| host\\_subnets | List of subnet names on which to grant network user role. | list(string) | `<list>` | no |\n | service\\_project\\_ids | Ids of the service projects that will be attached to the Shared VPC. | list(string) | n/a | yes |\n-| service\\_project\\_num | Number of service projects that will be attached to the Shared VPC. | string | `\"0\"` | no |\n+| service\\_project\\_num | Number of service projects that will be attached to the Shared VPC. | number | `\"0\"` | no |\n \n ## Outputs\n \n---\nmodules/fabric-net-svpc-access/variables.tf\n@@ -15,42 +15,49 @@\n */\n \n variable \"host_project_id\" {\n+ = string\n description = \"Project id of the shared VPC host project.\"\n }\n \n # passed-in values can be dynamic, so variables used in count need to be separate\n \n variable \"service_project_num\" {\n+ type = number\n description = \"Number of service projects that will be attached to the Shared VPC.\"\n default = 0\n }\n \n variable \"service_project_ids\" {\n- description = \"Ids of the service projects that will be attached to the Shared VPC.\"\n type = list(string)\n+ description = \"Ids of the service projects that will be attached to the Shared VPC.\"\n }\n \n variable \"host_subnets\" {\n+ type = list(string)\n description = \"List of subnet names on which to grant network user role.\"\n default = []\n }\n \n variable \"host_subnet_regions\" {\n+ type = list(string)\n description = \"List of subnet regions, one per subnet.\"\n default = []\n }\n \n variable \"host_subnet_users\" {\n+ type = map(any)\n description = \"Map of comma-delimited IAM-style members to which network user roles for subnets will be assigned.\"\n default = {}\n }\n \n variable \"host_service_agent_role\" {\n+ type = bool\n description = \"Assign host service agent role to users in host_service_agent_users variable.\"\n default = false\n }\n \n variable \"host_service_agent_users\" {\n+ type = list(string)\n description = \"List of IAM-style users that will be granted the host service agent role on the host project.\"\n default = []\n }\n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-svpc-access/README.md\n@@ -41,13 +41,13 @@ module \"net-shared-vpc-access\" {\n | Name | Description | Type | Default | Required |\n |------|-------------|:----:|:-----:|:-----:|\n | host\\_project\\_id | Project id of the shared VPC host project. | string | n/a | yes |\n-| host\\_service\\_agent\\_role | Assign host service agent role to users in host_service_agent_users variable. | string | `\"false\"` | no |\n-| host\\_service\\_agent\\_users | List of IAM-style users that will be granted the host service agent role on the host project. | list | `<list>` | no |\n-| host\\_subnet\\_regions | List of subnet regions, one per subnet. | list | `<list>` | no |\n-| host\\_subnet\\_users | Map of comma-delimited IAM-style members to which network user roles for subnets will be assigned. | map | `<map>` | no |\n-| host\\_subnets | List of subnet names on which to grant network user role. | list | `<list>` | no |\n+| host\\_service\\_agent\\_role | Assign host service agent role to users in host_service_agent_users variable. | bool | `\"false\"` | no |\n+| host\\_service\\_agent\\_users | List of IAM-style users that will be granted the host service agent role on the host project. | list(string) | `<list>` | no |\n+| host\\_subnet\\_regions | List of subnet regions, one per subnet. | list(string) | `<list>` | no |\n+| host\\_subnet\\_users | Map of comma-delimited IAM-style members to which network user roles for subnets will be assigned. | map(any) | `<map>` | no |\n+| host\\_subnets | List of subnet names on which to grant network user role. | list(string) | `<list>` | no |\n | service\\_project\\_ids | Ids of the service projects that will be attached to the Shared VPC. | list(string) | n/a | yes |\n-| service\\_project\\_num | Number of service projects that will be attached to the Shared VPC. | string | `\"0\"` | no |\n+| service\\_project\\_num | Number of service projects that will be attached to the Shared VPC. | number | `\"0\"` | no |\n \n ## Outputs\n \n---\nmodules/fabric-net-svpc-access/variables.tf\n@@ -15,42 +15,49 @@\n */\n \n variable \"host_project_id\" {\n+ type = string\n description = \"Project id of the shared VPC host project.\"\n }\n \n # passed-in values can be dynamic, so variables used in count need to be separate\n \n variable \"service_project_num\" {\n+ type = number\n description = \"Number of service projects that will be attached to the Shared VPC.\"\n default = 0\n }\n \n variable \"service_project_ids\" {\n- description = \"Ids of the service projects that will be attached to the Shared VPC.\"\n type = list(string)\n+ description = \"Ids of the service projects that will be attached to the Shared VPC.\"\n }\n \n variable \"host_subnets\" {\n+ type = list(string)\n description = of subnet names on which to grant network user role.\"\n default = []\n }\n \n variable \"host_subnet_regions\" {\n+ type = list(string)\n description = \"List of subnet regions, one per subnet.\"\n default = []\n }\n \n variable \"host_subnet_users\" {\n+ type = map(any)\n description = \"Map of comma-delimited IAM-style members to which network user roles for subnets will be assigned.\"\n default = {}\n }\n \n variable \"host_service_agent_role\" {\n+ type = bool\n description = \"Assign host service agent role to users in host_service_agent_users variable.\"\n default = false\n }\n \n variable \"host_service_agent_users\" {\n+ type = list(string)\n description = \"List of IAM-style users that will be granted the host service agent role on the host project.\"\n default = []\n }\n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-svpc-access/README.md\n@@ -41,13 +41,13 @@ module \"net-shared-vpc-access\" {\n | Name | Description | Type | Default | Required |\n |------|-------------|:----:|:-----:|:-----:|\n | host\\_project\\_id | Project id of the shared VPC host project. | string | n/a | yes |\n-| host\\_service\\_agent\\_role | Assign host service agent role to users in host_service_agent_users variable. | string | `\"false\"` | no |\n-| host\\_service\\_agent\\_users | List of IAM-style users that will be granted the host service agent role on the host project. | list | `<list>` | no |\n-| host\\_subnet\\_regions | List of subnet regions, one per subnet. | list | `<list>` | no |\n-| host\\_subnet\\_users | Map of comma-delimited IAM-style members to which network user roles for subnets will be assigned. | map | `<map>` | no |\n-| host\\_subnets | List of subnet names on which to grant network user role. | list | `<list>` | no |\n+| host\\_service\\_agent\\_role | Assign host service agent role to users in host_service_agent_users variable. | bool | `\"false\"` | no |\n+| host\\_service\\_agent\\_users | List of IAM-style users that will be granted the host service agent role on the host project. | list(string) | `<list>` | no |\n+| host\\_subnet\\_regions | List of subnet regions, one per subnet. | list(string) | `<list>` | no |\n+| host\\_subnet\\_users | Map of comma-delimited IAM-style members to which network user roles for subnets will be assigned. | map(any) | `<map>` | no |\n+| host\\_subnets | List of subnet names on which to grant network user role. | list(string) | `<list>` | no |\n | service\\_project\\_ids | Ids of the service projects that will be attached to the Shared VPC. | list(string) | n/a | yes |\n-| service\\_project\\_num | Number of service projects that will be attached to the Shared VPC. | string | `\"0\"` | no |\n+| service\\_project\\_num | Number of service projects that will be attached to the Shared VPC. | number | `\"0\"` | no |\n \n ## Outputs\n \n---\nmodules/fabric-net-svpc-access/variables.tf\n@@ -15,42 +15,49 @@\n */\n \n variable \"host_project_id\" {\n+ type = string\n description = \"Project id of the shared VPC host project.\"\n }\n \n # passed-in values can be dynamic, so variables used in count need to be separate\n \n variable \"service_project_num\" {\n+ type = number\n description = \"Number of service projects that will be attached to the Shared VPC.\"\n default = 0\n }\n \n variable \"service_project_ids\" {\n- description = \"Ids of the service projects that will be attached to the Shared VPC.\"\n type = list(string)\n+ description = \"Ids of the service projects that will be attached to the Shared VPC.\"\n }\n \n variable \"host_subnets\" {\n+ type = list(string)\n description = \"List of subnet names on which to grant network user role.\"\n default = []\n }\n \n variable \"host_subnet_regions\" {\n+ type = list(string)\n description = \"List of subnet regions, one per subnet.\"\n default = []\n }\n \n variable \"host_subnet_users\" {\n+ type = map(any)\n description = \"Map of comma-delimited IAM-style members to which network user roles for subnets will be assigned.\"\n default = {}\n }\n \n variable \"host_service_agent_role\" {\n+ type = bool\n description = \"Assign host service agent role to users in host_service_agent_users variable.\"\n default = false\n }\n \n variable \"host_service_agent_users\" {\n+ type = list(string)\n description = \"List of IAM-style users that will be granted the host service agent role on the host project.\"\n default = []\n }\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR is removing quotes around references to prevent the following warning message:\r\n\r\n```\r\nWarning: Quoted references are deprecated\r\n\r\n on .terraform/modules/vpc.peering/modules/network-peering/main.tf line 30, in resource \"google_compute_network_peering\" \"local_network_peering\":\r\n 30: depends_on = [\"null_resource.module_depends_on\"]\r\n\r\nIn this context, references are expected literally rather than in quotes.\r\nTerraform 0.11 and earlier required quotes, but quoted references are now\r\ndeprecated and will be removed in a future version of Terraform. Remove the\r\nquotes surrounding this reference to silence this warning.\r\n\r\n(and 4 more similar warnings elsewhere)\r\n```\n\n---\n\nChoice A:\nmodules/network-peering/main.tf\n@@ -27,7 +27,7 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n export_custom_routes = var.export_local_custom_routes\n import_custom_routes = var.export_peer_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\"]\n+ depends_on = [null_resource.module_depends_on]\n }\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n@@ -38,7 +38,7 @@ resource \"google_compute_network_peering\" \"peer_network_peering\" {\n export_custom_routes = var.export_peer_custom_routes\n import_custom_routes = var.export_local_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\", \"google_compute_network_peering.local_network_peering\"]\n+ depends_on = [null_resource.module_depends_on, google_compute_network_peering.local_network_peering]\n }\n \n resource \"null_resource\" \"module_depends_on\" {\n@@ -48,5 +48,5 @@ resource \"null_resource\" \"module_depends_on\" {\n }\n \n resource \"null_resource\" \"complete\" {\n- depends_on = [\"google_compute_network_peering.local_network_peering\", \"google_compute_network_peering.peer_network_peering\"]\n+ depends_on = [google_compute_network_peering.local_network_peering, google_compute_network_peering.peer_network_peering]\n }\n---\n\n\n---\n\nChoice B:\nmodules/network-peering/main.tf\n@@ -27,7 +27,7 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n export_custom_routes = var.export_local_custom_routes\n import_custom_routes = var.export_peer_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\"]\n+ depends_on = [null_resource.module_depends_on]\n }\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n@@ -38,7 +38,7 @@ resource \"google_compute_network_peering\" \"peer_network_peering\" {\n export_custom_routes = var.export_peer_custom_routes\n import_custom_routes = var.export_local_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\", \"google_compute_network_peering.local_network_peering\"]\n+ depends_on = [null_resource.module_depends_on, google_compute_network_peering.local_network_peering]\n }\n \n resource \"null_resource\" \"module_depends_on\" {\n@@ -48,5 +48,5 @@ resource \"null_resource\" \"module_depends_on\" {\n }\n \n resource \"null_resource\" \"complete\" {\n- depends_on = [\"google_compute_network_peering.local_network_peering\", \"google_compute_network_peering.peer_network_peering\"]\n+ depends_on depends_on = [google_compute_network_peering.local_network_peering, google_compute_network_peering.peer_network_peering]\n }\n---\n\n\n---\n\nChoice C:\nmodules/network-peering/main.tf\n@@ -27,7 +27,7 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n export_custom_routes = var.export_local_custom_routes\n import_custom_routes = -48,5 \n- depends_on = [\"null_resource.module_depends_on\"]\n+ depends_on = [null_resource.module_depends_on]\n }\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n@@ -38,7 +38,7 @@ resource \"google_compute_network_peering\" \"peer_network_peering\" {\n export_custom_routes = var.export_peer_custom_routes\n import_custom_routes = var.export_local_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\", \"google_compute_network_peering.local_network_peering\"]\n+ depends_on = [null_resource.module_depends_on, google_compute_network_peering.local_network_peering]\n }\n \n resource \"null_resource\" \"module_depends_on\" {\n@@ -48,5 +48,5 @@ resource \"null_resource\" \"module_depends_on\" {\n }\n \n resource \"null_resource\" \"complete\" {\n- depends_on = [\"google_compute_network_peering.local_network_peering\", \"google_compute_network_peering.peer_network_peering\"]\n+ depends_on = [google_compute_network_peering.local_network_peering, google_compute_network_peering.peer_network_peering]\n }\n---\n\n\n---\n\nChoice D:\nmodules/network-peering/main.tf\n@@ -27,7 +27,7 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\n export_custom_routes = var.export_local_custom_routes\n import_custom_routes = var.export_peer_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\"]\n+ depends_on = [null_resource.module_depends_on]\n }\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n@@ -38,7 +38,7 @@ resource \"google_compute_network_peering\" \"peer_network_peering\" {\n export_custom_routes = var.export_peer_custom_routes\n import_custom_routes = var.export_local_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\", \"google_compute_network_peering.local_network_peering\"]\n+ depends_on = [null_resource.module_depends_on, google_compute_network_peering.local_network_peering]\n }\n \n resource \"null_resource\" \"module_depends_on\" {\n@@ -48,5 +48,5 @@ resource \"null_resource\" \"module_depends_on\" {\n }\n \n resource \"null_resource\" \"complete\" {\n- depends_on = [\"google_compute_network_peering.local_network_peering\", \"google_compute_network_peering.peer_network_peering\"]\n+ depends_on = [google_compute_network_peering.local_network_peering, google_compute_network_peering.peer_network_peering]\n }\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR is renaming attribute `enable_logging` to `log_config` in order to prevent the following warning:\r\n\r\n```\r\nWarning: Attribute is deprecated\r\n\r\n on .terraform/modules/vpc.peering_fw_dev_mgmt/modules/fabric-net-firewall/main.tf line 134, in resource \"google_compute_firewall\" \"custom\":\r\n 134: enable_logging = lookup(each.value.extra_attributes, \"enable_logging\", null)\r\n\r\nDeprecated in favor of log_config\r\n```\n\n---\n\nChoice A:\nmodules/fabric-net-firewall/main.tf\n@@ -131,7 +131,15 @@ resource \"google_compute_firewall\" \"custom\" {\n target_service_accounts = each.value.use_service_accounts ? each.value.targets : null\n disabled = lookup(each.value.extra_attributes, \"disabled\", false)\n priority = lookup(each.value.extra_attributes, \"priority\", 1000)\n- enable_logging = lookup(each.value.extra_attributes, \"enable_logging\", null)\n+\n+ dynamic \"log_config\" {\n+ for_each = lookup(each.value, \"flow_logs\", false) ? [{\n+ metadata = lookup(each.value, \"flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ }] : []\n+ content {\n+ metadata = log_config.value.metadata\n+ }\n+ }\n \n dynamic \"allow\" {\n for_each = [for rule in each.value.rules : rule if each.value.action == \"allow\"]\n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-firewall/main.tf\n@@ -131,7 +131,15 @@ resource \"google_compute_firewall\" \"custom\" {\n target_service_accounts = each.value.use_service_accounts ? each.value.targets : null\n disabled = lookup(each.value.extra_attributes, \"disabled\", false)\n priority = lookup(each.value.extra_attributes, \"priority\", 1000)\n- enable_logging = lookup(each.value.extra_attributes, \"enable_logging\", null)\n+\n+ dynamic \"log_config\" {\n+ for_each = lookup(each.value, \"flow_logs\", false) ? [{\n+ metadata = lookup(each.value, \"flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ }] : []\n+ content {\n+ metadata = log_config.value.metadata\n+ }\n \n dynamic \"allow\" {\n for_each = [for rule in each.value.rules : rule if each.value.action == \"allow\"]\n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-firewall/main.tf\n@@ -131,7 +131,15 @@ resource \"google_compute_firewall\" \"custom\" {\n target_service_accounts = each.value.use_service_accounts ? each.value.targets : null\n disabled = lookup(each.value.extra_attributes, \"disabled\", false)\n priority = lookup(each.value.extra_attributes, \"priority\", 1000)\n- enable_logging = lookup(each.value.extra_attributes, \"enable_logging\", null)\n+\n+ dynamic \"log_config\" {\n+ for_each = lookup(each.value, \"flow_logs\", false) ? [{\n+ rule metadata = lookup(each.value, \"flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ }] : []\n+ content {\n+ metadata = log_config.value.metadata\n+ }\n+ }\n \n dynamic \"allow\" {\n for_each = [for rule in each.value.rules : rule if each.value.action == \"allow\"]\n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-firewall/main.tf\n@@ -131,7 +131,15 @@ resource \"google_compute_firewall\" \"custom\" {\n target_service_accounts = each.value.use_service_accounts ? each.value.targets : null\n disabled = lookup(each.value.extra_attributes, \"disabled\", false)\n priority = lookup(each.value.extra_attributes, \"priority\", 1000)\n- enable_logging = lookup(each.value.extra_attributes, \"enable_logging\", null)\n+\n+ dynamic \"log_config\" {\n+ for_each = lookup(each.value, \"flow_logs\", false) ? [{\n+ metadata = lookup(each.value, \"flow_logs_metadata\", \"INCLUDE_ALL_METADATA\")\n+ }] : []\n+ content {\n+ metadata = log_config.value.metadata\n+ }\n+ }\n \n dynamic \"allow\" {\n for_each = [for rule in each.value.rules : rule if each.value.action == lookup(each.value,\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nfixes #196 \r\n- relax version constraint to allow usage with 0.13\r\n- Kitchen tests [run with `v0.13.0-rc1`](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/commit/88017ad3bc0d40473ac3d94546660328aeee878d) \r\n - All tests passed\r\n- module `for_each` spot checked, have not tested `depends_on`, but based on other modules I expect it to work\n\n---\n\nChoice A:\n.kitchen.yml\n@@ -16,6 +16,7 @@\n driver:\n name: \"terraform\"\n command_timeout: 1800\n+ verify_version: false\n \n provisioner:\n name: \"terraform\"\n---\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.6.0\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -166,4 +166,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.6.0'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'\n---\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = substitutions:\n 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n\nChoice B:\n.kitchen.yml\n@@ -16,6 +16,7 @@\n driver:\n name: \"terraform\"\n command_timeout: 1800\n+ verify_version: false\n \n provisioner:\n name: \"terraform\"\n---\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.6.0\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -166,4 +166,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.6.0'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'\n---\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, required_providers required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n\nChoice C:\n.kitchen.yml\n@@ -16,6 +16,7 @@\n driver:\n name: \"terraform\"\n command_timeout: 1800\n+ verify_version: false\n \n provisioner:\n name: \"terraform\"\n---\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.6.0\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -166,4 +166,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.6.0'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'\n---\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> -15,5 required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n\nChoice D:\n.kitchen.yml\n@@ -16,6 +16,7 @@\n driver:\n name: \"terraform\"\n command_timeout: 1800\n+ verify_version: false\n \n provisioner:\n name: \"terraform\"\n---\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.6.0\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -166,4 +166,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.6.0'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'\n---\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR sets explicit types for all variables.\r\n\r\nThis relates to #158 and fixes #157 \r\n\r\nTeam work with: @rdavidr @silvaom @lucrevillegas\r\n\r\n\n\n---\n\nChoice A:\nexamples/submodule_firewall/main.tf\n@@ -128,15 +128,16 @@ module \"test-firewall-submodule\" {\n \n internal_allow = [\n {\n- protocol = \"icmp\"\n+ protocol = \"icmp\",\n+ ports = [] # all ports\n },\n {\n protocol = \"tcp\",\n ports = [\"8080\", \"1000-2000\"]\n },\n {\n protocol = \"udp\"\n- # all ports will be opened if `ports` key isn't specified\n+ ports = null # all ports\n },\n ]\n custom_rules = local.custom_rules\n---\nmodules/fabric-net-firewall/README.md\n@@ -73,21 +73,21 @@ module \"net-firewall\" {\n \n | Name | Description | Type | Default | Required |\n |------|-------------|:----:|:-----:|:-----:|\n-| admin\\_ranges | IP CIDR ranges that have complete access to all subnets. | list | `<list>` | no |\n-| admin\\_ranges\\_enabled | Enable admin ranges-based rules. | string | `\"false\"` | no |\n+| admin\\_ranges | IP CIDR ranges that have complete access to all subnets. | list(string) | `<list>` | no |\n+| admin\\_ranges\\_enabled | Enable admin ranges-based rules. | bool | `\"false\"` | no |\n | custom\\_rules | List of custom rule definitions (refer to variables file for syntax). | object | `<map>` | no |\n-| http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n-| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | list | `<list>` | no |\n-| https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n-| https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | list | `<list>` | no |\n-| internal\\_allow | Allow rules for internal ranges. | list | `<list>` | no |\n-| internal\\_ranges | IP CIDR ranges for intra-VPC rules. | list | `<list>` | no |\n-| internal\\_ranges\\_enabled | Create rules for intra-VPC ranges. | string | `\"false\"` | no |\n-| internal\\_target\\_tags | List of target tags for intra-VPC rules. | list | `<list>` | no |\n+| http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | list(string) | `<list>` | no |\n+| http\\_target\\_tags | List of target tags for tag-based HTTP rule, to http-server. | list(string) | `<list>` | no |\n+| https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | list(string) | `<list>` | no |\n+| https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | list(string) | `<list>` | no |\n+| internal\\_allow | Allow rules for internal ranges. | object | `<list>` | no |\n+| internal\\_ranges | IP CIDR ranges for intra-VPC rules. | list(string) | `<list>` | no |\n+| internal\\_ranges\\_enabled | Create rules for intra-VPC ranges. | bool | `\"false\"` | no |\n+| internal\\_target\\_tags | List of target tags for intra-VPC rules. | list(string) | `<list>` | no |\n | network | Name of the network this set of firewall rules applies to. | string | n/a | yes |\n | project\\_id | Project id of the project that holds the network. | string | n/a | yes |\n-| ssh\\_source\\_ranges | List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n-| ssh\\_target\\_tags | List of target tags for tag-based SSH rule, defaults to ssh. | list | `<list>` | no |\n+| ssh\\_source\\_ranges | List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0. | list(string) | `<list>` | no |\n+| ssh\\_target\\_tags | List of target tags for tag-based SSH rule, defaults to ssh. | list(string) | `<list>` | no |\n \n ## Outputs\n \n---\nmodules/fabric-net-firewall/main.tf\n@@ -30,8 +30,8 @@ resource \"google_compute_firewall\" \"allow-internal\" {\n dynamic \"allow\" {\n for_each = [for rule in var.internal_allow :\n {\n- protocol = lookup(rule, \"protocol\", null)\n- ports = lookup(rule, \"ports\", null)\n+ protocol = rule.protocol\n+ ports = rule.ports\n }\n ]\n content {\n---\nmodules/fabric-net-firewall/variables.tf\n@@ -24,65 +24,81 @@ variable \"project_id\" {\n \n variable \"internal_ranges_enabled\" {\n description = \"Create rules for intra-VPC ranges.\"\n+ type = bool\n default = false\n }\n \n variable \"internal_ranges\" {\n description = \"IP CIDR ranges for intra-VPC rules.\"\n+ type = list(string)\n default = []\n }\n \n variable \"internal_target_tags\" {\n description = \"List of target tags for intra-VPC rules.\"\n+ type = list(string)\n default = []\n }\n \n variable \"internal_allow\" {\n description = \"Allow rules for internal ranges.\"\n+ type = list(object({\n+ protocol = string\n+ ports = list(string)\n+ }))\n default = [\n {\n protocol = \"icmp\"\n- },\n+ ports = []\n+ }\n ]\n }\n \n variable \"admin_ranges_enabled\" {\n description = \"Enable admin ranges-based rules.\"\n+ type = bool\n default = false\n }\n \n variable \"admin_ranges\" {\n description = \"IP CIDR ranges that have complete access to all subnets.\"\n+ type = list(string)\n default = []\n }\n \n variable \"ssh_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"ssh_target_tags\" {\n description = \"List of target tags for tag-based SSH rule, defaults to ssh.\"\n+ type = list(string)\n default = [\"ssh\"]\n }\n \n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"http_target_tags\" {\n description = \"List of target tags for tag-based HTTP rule, defaults to http-server.\"\n+ type = list(string)\n default = [\"http-server\"]\n }\n \n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"https_target_tags\" {\n description = \"List of target tags for tag-based HTTPS rule, defaults to https-server.\"\n+ type = list(string)\n default = [\"https-server\"]\n }\n \n---\n\n\n---\n\nChoice B:\nexamples/submodule_firewall/main.tf\n@@ -128,15 +128,16 @@ module \"test-firewall-submodule\" {\n \n internal_allow = [\n {\n- protocol = \"icmp\"\n+ protocol = \"icmp\",\n+ ports = [] # all ports\n },\n {\n protocol = \"tcp\",\n ports = [\"8080\", \"1000-2000\"]\n },\n {\n protocol = \"udp\"\n- # all ports will be opened if `ports` key isn't specified\n+ ports = null # all ports\n },\n ]\n custom_rules = local.custom_rules\n---\nmodules/fabric-net-firewall/README.md\n@@ -73,21 +73,21 @@ module \"net-firewall\" {\n \n | Name | Description | Type | Default | Required |\n |------|-------------|:----:|:-----:|:-----:|\n-| admin\\_ranges | IP CIDR ranges that have complete access to all subnets. | list | `<list>` | no |\n-| admin\\_ranges\\_enabled | Enable admin ranges-based rules. | string | `\"false\"` | no |\n+| admin\\_ranges | IP CIDR ranges that have complete access to all subnets. | list(string) | `<list>` | no |\n+| admin\\_ranges\\_enabled | Enable admin ranges-based rules. | bool | `\"false\"` | no |\n | custom\\_rules | List of custom rule definitions (refer to variables file for syntax). | object | `<map>` | no |\n-| http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n-| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | list | `<list>` | no |\n-| https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n-| https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | list | `<list>` | no |\n-| internal\\_allow | Allow rules for internal ranges. | list | `<list>` | no |\n-| internal\\_ranges | IP CIDR ranges for intra-VPC rules. | list | `<list>` | no |\n-| internal\\_ranges\\_enabled | Create rules for intra-VPC ranges. | string | `\"false\"` | no |\n-| internal\\_target\\_tags | List of target tags for intra-VPC rules. | list | `<list>` | no |\n+| http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | list(string) | `<list>` | no |\n+| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | list(string) | `<list>` | no |\n+| https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | list(string) | `<list>` | no |\n+| https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | list(string) | `<list>` | no |\n+| internal\\_allow | Allow rules for internal ranges. | object | `<list>` | no |\n+| internal\\_ranges | IP CIDR ranges for intra-VPC rules. | list(string) | `<list>` | no |\n+| internal\\_ranges\\_enabled | Create rules for intra-VPC ranges. | bool | `\"false\"` | no |\n+| internal\\_target\\_tags | List of target tags for intra-VPC rules. | list(string) | `<list>` | no |\n | network | Name of the network this set of firewall rules applies to. | string | n/a | yes |\n | project\\_id | Project id of the project that holds the network. | string | n/a | yes |\n-| ssh\\_source\\_ranges | List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n-| ssh\\_target\\_tags | List of target tags for tag-based SSH rule, defaults to ssh. | list | `<list>` | no |\n+| ssh\\_source\\_ranges | List of IP CIDR ranges for tag-based SSH rule, defaults to }\n | list(string) | `<list>` | no |\n+| ssh\\_target\\_tags | List of target tags for tag-based SSH rule, defaults to ssh. | list(string) | `<list>` | no |\n \n ## Outputs\n \n---\nmodules/fabric-net-firewall/main.tf\n@@ -30,8 +30,8 @@ resource \"google_compute_firewall\" \"allow-internal\" {\n dynamic \"allow\" {\n for_each = [for rule in var.internal_allow :\n {\n- protocol = lookup(rule, \"protocol\", null)\n- ports = lookup(rule, \"ports\", null)\n+ protocol = rule.protocol\n+ ports = rule.ports\n }\n ]\n content {\n---\nmodules/fabric-net-firewall/variables.tf\n@@ -24,65 +24,81 @@ variable \"project_id\" {\n \n variable \"internal_ranges_enabled\" {\n description = \"Create rules for intra-VPC ranges.\"\n+ type = bool\n default = false\n }\n \n variable \"internal_ranges\" {\n description = \"IP CIDR ranges for intra-VPC rules.\"\n+ type = list(string)\n default = []\n }\n \n variable \"internal_target_tags\" {\n description = \"List of target tags for intra-VPC rules.\"\n+ type = list(string)\n default = []\n }\n \n variable \"internal_allow\" {\n description = \"Allow rules for internal ranges.\"\n+ type = list(object({\n+ protocol = string\n+ ports = list(string)\n+ }))\n default = [\n {\n protocol = \"icmp\"\n- },\n+ ports = []\n+ }\n ]\n }\n \n variable \"admin_ranges_enabled\" {\n description = \"Enable admin ranges-based rules.\"\n+ type = bool\n default = false\n }\n \n variable \"admin_ranges\" {\n description = \"IP CIDR ranges that have complete access to all subnets.\"\n+ type = list(string)\n default = []\n }\n \n variable \"ssh_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"ssh_target_tags\" {\n description = \"List of target tags for tag-based SSH rule, defaults to ssh.\"\n+ type = list(string)\n default = [\"ssh\"]\n }\n \n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"http_target_tags\" {\n description = \"List of target tags for tag-based HTTP rule, defaults to http-server.\"\n+ type = list(string)\n default = [\"http-server\"]\n }\n \n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"https_target_tags\" {\n description = \"List of target tags for tag-based HTTPS rule, defaults to https-server.\"\n+ type = list(string)\n default = [\"https-server\"]\n }\n \n---\n\n\n---\n\nChoice C:\nexamples/submodule_firewall/main.tf\n@@ -128,15 +128,16 @@ module \"test-firewall-submodule\" {\n \n internal_allow = [\n {\n- protocol = \"icmp\"\n+ protocol = \"icmp\",\n+ ports = [] # all ports\n },\n {\n protocol = \"tcp\",\n ports = [\"8080\", \"1000-2000\"]\n },\n {\n protocol = \"udp\"\n- # all ports will be opened if `ports` key isn't specified\n+ ports = null # all ports\n },\n ]\n custom_rules = local.custom_rules\n---\nmodules/fabric-net-firewall/README.md\n@@ -73,21 +73,21 @@ module \"net-firewall\" {\n \n | Name | Description | Type | Default | Required |\n |------|-------------|:----:|:-----:|:-----:|\n-| admin\\_ranges | IP CIDR ranges that have complete access to all subnets. | list | `<list>` | no |\n-| admin\\_ranges\\_enabled | Enable admin ranges-based rules. | string | `\"false\"` | no |\n+| admin\\_ranges | IP CIDR ranges that have complete access to all subnets. | list(string) | `<list>` | no |\n+| admin\\_ranges\\_enabled | Enable admin ranges-based rules. | bool | `\"false\"` | no |\n | custom\\_rules | List of custom rule definitions (refer to variables file for syntax). | object | `<map>` | no |\n-| http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n-| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | list | `<list>` | no |\n-| https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n-| https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | list | `<list>` | no |\n-| internal\\_allow | Allow rules for internal ranges. | list | `<list>` | no |\n-| internal\\_ranges | IP CIDR ranges for intra-VPC rules. | list | `<list>` | no |\n-| internal\\_ranges\\_enabled | Create rules for intra-VPC ranges. | string | `\"false\"` | no |\n-| internal\\_target\\_tags | List of target tags for intra-VPC rules. | list | `<list>` | no |\n+| http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | list(string) | `<list>` | no |\n+| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | list(string) | `<list>` | no |\n+| https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | list(string) | `<list>` | no |\n+| https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | list(string) | `<list>` | no |\n+| internal\\_allow | Allow rules for internal ranges. | object | `<list>` | no |\n+| internal\\_ranges | IP CIDR ranges for intra-VPC rules. | list(string) | `<list>` | no |\n+| internal\\_ranges\\_enabled | Create rules for intra-VPC ranges. | bool | `\"false\"` | no |\n+| internal\\_target\\_tags | List of target tags for intra-VPC rules. | list(string) | `<list>` | no |\n | network | Name of the network this set of firewall rules applies to. | string | n/a | yes |\n | project\\_id | Project id of the project that holds the network. | string | n/a | yes |\n-| ssh\\_source\\_ranges | List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n-| ssh\\_target\\_tags | List of target tags for tag-based SSH rule, defaults to ssh. | list | `<list>` | no |\n+| ssh\\_source\\_ranges | List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0. | list(string) | `<list>` | no |\n+| ssh\\_target\\_tags | List of target tags for tag-based SSH rule, defaults to ssh. | list(string) | `<list>` | no |\n \n ## Outputs\n \n---\nmodules/fabric-net-firewall/main.tf\n@@ -30,8 +30,8 @@ resource \"google_compute_firewall\" \"allow-internal\" {\n dynamic \"allow\" {\n for_each = [for rule in var.internal_allow :\n {\n- protocol = lookup(rule, \"protocol\", null)\n- ports = lookup(rule, \"ports\", null)\n+ protocol = rule.protocol\n+ ports = rule.ports\n }\n ]\n content {\n---\nmodules/fabric-net-firewall/variables.tf\n@@ -24,65 +24,81 @@ variable \"project_id\" {\n \n variable \"internal_ranges_enabled\" {\n description = \"Create rules for intra-VPC ranges.\"\n+ type = bool\n default = false\n }\n \n variable \"internal_ranges\" {\n description = \"IP CIDR ranges for intra-VPC rules.\"\n+ type = list(string)\n default = []\n }\n \n variable \"internal_target_tags\" {\n description = \"List of target tags for intra-VPC rules.\"\n+ type = list(string)\n default = []\n }\n \n variable \"internal_allow\" {\n description = \"Allow rules for internal ranges.\"\n+ type list(object({\n+ protocol = string\n+ ports = list(string)\n+ }))\n default = [\n {\n protocol = \"icmp\"\n- },\n+ ports = []\n+ }\n ]\n }\n \n variable \"admin_ranges_enabled\" {\n description = \"Enable admin ranges-based rules.\"\n+ type = bool\n default = false\n }\n \n variable \"admin_ranges\" {\n description = \"IP CIDR ranges that have complete access to all subnets.\"\n+ type = list(string)\n default = []\n }\n \n variable \"ssh_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"ssh_target_tags\" {\n description = \"List of target tags for tag-based SSH rule, defaults to ssh.\"\n+ type = list(string)\n default = [\"ssh\"]\n }\n \n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"http_target_tags\" {\n description = \"List of target tags for tag-based HTTP rule, defaults to http-server.\"\n+ type = list(string)\n default = [\"http-server\"]\n }\n \n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"https_target_tags\" {\n description = \"List of target tags for tag-based HTTPS rule, defaults to https-server.\"\n+ type = list(string)\n default = [\"https-server\"]\n }\n \n---\n\n\n---\n\nChoice D:\nexamples/submodule_firewall/main.tf\n@@ -128,15 +128,16 @@ module \"test-firewall-submodule\" {\n \n internal_allow = [\n {\n- protocol = \"icmp\"\n+ protocol = \"icmp\",\n+ ports = [] # all ports\n },\n {\n protocol = \"tcp\",\n ports = [\"8080\", \"1000-2000\"]\n },\n {\n protocol = \"udp\"\n- # all ports will be opened if `ports` key isn't specified\n+ ports = null # all ports\n },\n ]\n custom_rules = local.custom_rules\n---\nmodules/fabric-net-firewall/README.md\n@@ -73,21 +73,21 @@ module \"net-firewall\" {\n \n | Name | Description | Type | Default | Required |\n |------|-------------|:----:|:-----:|:-----:|\n-| admin\\_ranges | IP CIDR ranges that have complete access to all subnets. | list | `<list>` | no |\n-| admin\\_ranges\\_enabled | Enable admin ranges-based rules. | string | `\"false\"` | no |\n+| admin\\_ranges | IP CIDR ranges that have complete access to all subnets. | list(string) | `<list>` | no |\n+| admin\\_ranges\\_enabled | Enable admin ranges-based rules. | bool | `\"false\"` | no |\n | custom\\_rules | List of custom rule definitions (refer to variables file for syntax). | object | `<map>` | no |\n-| http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n-| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | list | `<list>` | no |\n-| https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n-| https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | list | `<list>` | no |\n-| internal\\_allow | Allow rules for internal ranges. | list | `<list>` | no |\n-| internal\\_ranges | IP CIDR ranges for intra-VPC rules. | list | `<list>` | no |\n-| internal\\_ranges\\_enabled | Create rules for intra-VPC ranges. | string | `\"false\"` | no |\n-| internal\\_target\\_tags | List of target tags for intra-VPC rules. | list | `<list>` | no |\n+| http\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0. | list(string) | `<list>` | no |\n+| http\\_target\\_tags | List of target tags for tag-based HTTP rule, defaults to http-server. | list(string) | `<list>` | no |\n+| https\\_source\\_ranges | List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0. | list(string) | `<list>` | no |\n+| https\\_target\\_tags | List of target tags for tag-based HTTPS rule, defaults to https-server. | list(string) | `<list>` | no |\n+| internal\\_allow | Allow rules for internal ranges. | object | `<list>` | no |\n+| internal\\_ranges | IP CIDR ranges for intra-VPC rules. | list(string) | `<list>` | no |\n+| internal\\_ranges\\_enabled | Create rules for intra-VPC ranges. | bool | `\"false\"` | no |\n+| internal\\_target\\_tags | List of target tags for intra-VPC rules. | list(string) | `<list>` | no |\n | network | Name of the network this set of firewall rules applies to. | string | n/a | yes |\n | project\\_id | Project id of the project that holds the network. | string | n/a | yes |\n-| ssh\\_source\\_ranges | List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0. | list | `<list>` | no |\n-| ssh\\_target\\_tags | List of target tags for tag-based SSH rule, defaults to ssh. | list | `<list>` | no |\n+| ssh\\_source\\_ranges | List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0. | list(string) | `<list>` | no |\n+| ssh\\_target\\_tags | List of target tags for tag-based SSH rule, defaults to ssh. | list(string) | `<list>` | no |\n \n ## Outputs\n \n---\nmodules/fabric-net-firewall/main.tf\n@@ -30,8 +30,8 @@ resource \"google_compute_firewall\" \"allow-internal\" {\n dynamic \"allow\" {\n for_each = [for rule in var.internal_allow :\n {\n- protocol = lookup(rule, \"protocol\", null)\n- ports = lookup(rule, \"ports\", null)\n+ protocol = rule.protocol\n+ ports = rule.ports\n }\n ]\n content {\n---\nmodules/fabric-net-firewall/variables.tf\n@@ -24,65 +24,81 @@ variable \"project_id\" {\n \n variable \"internal_ranges_enabled\" {\n description = \"Create rules for intra-VPC ranges.\"\n+ type = bool\n default = false\n }\n \n variable \"internal_ranges\" {\n description = \"IP CIDR ranges for intra-VPC rules.\"\n+ type = list(string)\n default = []\n }\n \n variable \"internal_target_tags\" {\n description = \"List of target tags for intra-VPC rules.\"\n+ type = list(string)\n default = []\n }\n \n variable \"internal_allow\" {\n description = \"Allow rules for internal ranges.\"\n+ type = list(object({\n+ protocol = string\n+ ports = list(string)\n+ }))\n default = [\n {\n protocol = \"icmp\"\n- },\n+ ports = []\n+ }\n ]\n }\n \n variable \"admin_ranges_enabled\" {\n description = \"Enable admin ranges-based rules.\"\n+ type = bool\n default = false\n }\n \n variable \"admin_ranges\" {\n description = \"IP CIDR ranges that have complete access to all subnets.\"\n+ type = list(string)\n default = []\n }\n \n variable \"ssh_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based SSH rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"ssh_target_tags\" {\n description = \"List of target tags for tag-based SSH rule, defaults to ssh.\"\n+ type = list(string)\n default = [\"ssh\"]\n }\n \n variable \"http_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTP rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"http_target_tags\" {\n description = \"List of target tags for tag-based HTTP rule, defaults to http-server.\"\n+ type = list(string)\n default = [\"http-server\"]\n }\n \n variable \"https_source_ranges\" {\n description = \"List of IP CIDR ranges for tag-based HTTPS rule, defaults to 0.0.0.0/0.\"\n+ type = list(string)\n default = [\"0.0.0.0/0\"]\n }\n \n variable \"https_target_tags\" {\n description = \"List of target tags for tag-based HTTPS rule, defaults to https-server.\"\n+ type = list(string)\n default = [\"https-server\"]\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 VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n\n\n---\n\nChoice A:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [2.3.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v2.3.0...v2.3.1) (2020-04-28)\n+\n+\n+### Bug Fixes\n+\n+* Resolve Invalid index error on shared vpc destroy ([#177](https://www.github.com/terraform-google-modules/terraform-google-network/issues/177)) ([b799266](https://www.github.com/terraform-google-modules/terraform-google-network/commit/b799266146daffa3ba75f3fb5c7920c5f1df165c))\n+\n ## [2.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v2.2.0...v2.3.0) (2020-04-16)\n \n \n---\nmodules/network-peering/main.tf\n@@ -20,25 +20,25 @@ locals {\n }\n \n resource \"google_compute_network_peering\" \"local_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google\n name = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n network = var.local_network\n peer_network = var.peer_network\n export_custom_routes = var.export_local_custom_routes\n import_custom_routes = var.export_peer_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\"]\n+ depends_on = [null_resource.module_depends_on]\n }\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google\n name = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n network = var.peer_network\n peer_network = var.local_network\n export_custom_routes = var.export_peer_custom_routes\n import_custom_routes = var.export_local_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\", \"google_compute_network_peering.local_network_peering\"]\n+ depends_on = [null_resource.module_depends_on, google_compute_network_peering.local_network_peering]\n }\n \n resource \"null_resource\" \"module_depends_on\" {\n@@ -48,5 +48,5 @@ resource \"null_resource\" \"module_depends_on\" {\n }\n \n resource \"null_resource\" \"complete\" {\n- depends_on = [\"google_compute_network_peering.local_network_peering\", \"google_compute_network_peering.peer_network_peering\"]\n+ depends_on = [google_compute_network_peering.local_network_peering, google_compute_network_peering.peer_network_peering]\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [2.3.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v2.3.0...v2.3.1) (2020-04-28)\n+\n+\n+### Bug Fixes\n+\n+* Resolve Invalid index error on shared vpc destroy ([#177](https://www.github.com/terraform-google-modules/terraform-google-network/issues/177)) ([b799266](https://www.github.com/terraform-google-modules/terraform-google-network/commit/b799266146daffa3ba75f3fb5c7920c5f1df165c))\n+\n ## [2.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v2.2.0...v2.3.0) (2020-04-16)\n \n \n---\nmodules/network-peering/main.tf\n@@ -20,25 +20,25 @@ locals {\n }\n \n resource \"google_compute_network_peering\" \"local_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google\n name = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n network = var.local_network\n peer_network = var.peer_network\n export_custom_routes = var.export_local_custom_routes\n import_custom_routes = var.export_peer_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\"]\n+ depends_on = [null_resource.module_depends_on]\n }\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google\n name = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n network = var.peer_network\n peer_network in = var.local_network\n export_custom_routes = var.export_peer_custom_routes\n import_custom_routes = var.export_local_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\", \"google_compute_network_peering.local_network_peering\"]\n+ depends_on = [null_resource.module_depends_on, google_compute_network_peering.local_network_peering]\n }\n \n resource \"null_resource\" \"module_depends_on\" {\n@@ -48,5 +48,5 @@ resource \"null_resource\" \"module_depends_on\" {\n }\n \n resource \"null_resource\" \"complete\" {\n- depends_on = [\"google_compute_network_peering.local_network_peering\", \"google_compute_network_peering.peer_network_peering\"]\n+ depends_on = [google_compute_network_peering.local_network_peering, google_compute_network_peering.peer_network_peering]\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n \n+### [2.3.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v2.3.0...v2.3.1) (2020-04-28)\n+\n+\n+### Bug Fixes\n+\n+* Resolve Invalid index error on shared vpc destroy ([#177](https://www.github.com/terraform-google-modules/terraform-google-network/issues/177)) ([b799266](https://www.github.com/terraform-google-modules/terraform-google-network/commit/b799266146daffa3ba75f3fb5c7920c5f1df165c))\n+\n ## [2.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v2.2.0...v2.3.0) (2020-04-16)\n \n \n---\nmodules/network-peering/main.tf\n@@ -20,25 +20,25 @@ locals {\n }\n \n resource \"google_compute_network_peering\" \"local_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google\n name = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n network = var.local_network\n peer_network = var.peer_network\n export_custom_routes = var.export_local_custom_routes\n import_custom_routes = var.export_peer_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\"]\n+ depends_on = [null_resource.module_depends_on]\n }\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n- provider = \"google-beta\"\n+ provider (2020-04-16)\n = google\n name = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n network = var.peer_network\n peer_network = var.local_network\n export_custom_routes = var.export_peer_custom_routes\n import_custom_routes = var.export_local_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\", \"google_compute_network_peering.local_network_peering\"]\n+ depends_on = [null_resource.module_depends_on, google_compute_network_peering.local_network_peering]\n }\n \n resource \"null_resource\" \"module_depends_on\" {\n@@ -48,5 +48,5 @@ resource \"null_resource\" \"module_depends_on\" {\n }\n \n resource \"null_resource\" \"complete\" {\n- depends_on = [\"google_compute_network_peering.local_network_peering\", \"google_compute_network_peering.peer_network_peering\"]\n+ depends_on = [google_compute_network_peering.local_network_peering, google_compute_network_peering.peer_network_peering]\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,13 @@\n \n All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for guidelines.\n \n+### [2.3.1](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v2.3.0...v2.3.1) (2020-04-28)\n+\n+\n+### Bug Fixes\n+\n+* Resolve Invalid index error on shared vpc destroy ([#177](https://www.github.com/terraform-google-modules/terraform-google-network/issues/177)) ([b799266](https://www.github.com/terraform-google-modules/terraform-google-network/commit/b799266146daffa3ba75f3fb5c7920c5f1df165c))\n+\n ## [2.3.0](https://www.github.com/terraform-google-modules/terraform-google-network/compare/v2.2.0...v2.3.0) (2020-04-16)\n \n \n---\nmodules/network-peering/main.tf\n@@ -20,25 +20,25 @@ locals {\n }\n \n resource \"google_compute_network_peering\" \"local_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google\n name = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n network = var.local_network\n peer_network = var.peer_network\n export_custom_routes = var.export_local_custom_routes\n import_custom_routes = var.export_peer_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\"]\n+ depends_on = [null_resource.module_depends_on]\n }\n \n resource \"google_compute_network_peering\" \"peer_network_peering\" {\n- provider = \"google-beta\"\n+ provider = google\n name = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n network = var.peer_network\n peer_network = var.local_network\n export_custom_routes = var.export_peer_custom_routes\n import_custom_routes = var.export_local_custom_routes\n \n- depends_on = [\"null_resource.module_depends_on\", \"google_compute_network_peering.local_network_peering\"]\n+ depends_on = [null_resource.module_depends_on, google_compute_network_peering.local_network_peering]\n }\n \n resource \"null_resource\" \"module_depends_on\" {\n@@ -48,5 +48,5 @@ resource \"null_resource\" \"module_depends_on\" {\n }\n \n resource \"null_resource\" \"complete\" {\n- depends_on = [\"google_compute_network_peering.local_network_peering\", \"google_compute_network_peering.peer_network_peering\"]\n+ depends_on = [google_compute_network_peering.local_network_peering, google_compute_network_peering.peer_network_peering]\n }\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n\n\n---\n\nChoice A:\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">= 0.12\"\n required_providers {\n google = 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">= 0.12\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n\nChoice B:\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">= 0.12\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">= 0.12\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n\nChoice C:\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n \"~> */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">= 0.12\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">= 0.12\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n\nChoice D:\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">= 0.12\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">= 0.12\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \"~> 0.12.6\"\n+ required_version = \">=0.12.6, <0.14\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nRemove < 0.14 constraint\n\n---\n\nChoice A:\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n\nChoice B:\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n\nChoice C:\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ = = \">=0.12.6\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n\nChoice D:\nexamples/delete_default_gateway_routes/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/ilb_routing/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/multi_vpc/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/secondary_ranges/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/simple_project_with_regional_network/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_firewall/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_network_peering/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nexamples/submodule_svpc_access/versions.tf\n@@ -15,5 +15,5 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/network-peering/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/routes-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \"~> 2.19.0\"\n }\n---\nmodules/routes/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/subnets-beta/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google-beta = \">= 2.19.0, <4.0.0\"\n }\n---\nmodules/subnets/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\nmodules/vpc/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\ntest/setup/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n }\n \n provider \"google\" {\n---\nversions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">=0.12.6, <0.14\"\n+ required_version = \">=0.12.6\"\n required_providers {\n google = \"<4.0,>= 2.12\"\n }\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nFixes #109\n\n---\n\nChoice A:\nmodules/fabric-net-svpc-access/README.md\n@@ -18,7 +18,8 @@ Basic usage of this module is as follows:\n \n ```hcl\n module \"net-shared-vpc-access\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/fabric-net-svpc-access\"\n+ source = \"terraform-google-modules/network/google//modules/fabric-net-svpc-access\"\n+ version = \"~> 1.4.0\"\n host_project_id \"terraform-google-modules/terraform-google-network/google//modules/fabric-net-svpc-access\"\n+ \"my-host-project-id\"\n service_project_num = 1\n service_project_ids = [\"my-service-project-id\"]\n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-svpc-access/README.md\n@@ -18,7 +18,8 @@ Basic usage of this module is as follows:\n \n ```hcl\n module \"net-shared-vpc-access\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/fabric-net-svpc-access\"\n+ source = \"terraform-google-modules/network/google//modules/fabric-net-svpc-access\"\n+ version = \"~> 1.4.0\"\n host_project_id = \"my-host-project-id\"\n service_project_num = 1\n service_project_ids = [\"my-service-project-id\"]\n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-svpc-access/README.md\n@@ -18,7 +18,8 @@ Basic usage of this module is as follows:\n \n ```hcl\n module \"net-shared-vpc-access\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/fabric-net-svpc-access\"\n+ source = \"terraform-google-modules/network/google//modules/fabric-net-svpc-access\"\n+ version = \"~> 1.4.0\"\n host_project_id = \"my-host-project-id\"\n service_project_num = 1\n service_project_ids = [\"my-service-project-id\"]\n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-svpc-access/README.md\n@@ -18,7 +18,8 @@ Basic usage of this module is as follows:\n \n ```hcl\n module \"net-shared-vpc-access\" {\n- source = \"terraform-google-modules/terraform-google-network/google//modules/fabric-net-svpc-access\"\n+ source = \"terraform-google-modules/network/google//modules/fabric-net-svpc-access\"\n+ version = \"~> 1.4.0\"\n host_project_id = \"my-host-project-id\"\n service_project_num = 1\n service_project_ids = [\"my-service-project-id\"]\n---\n\n\n---\n"
}
] |
B
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.