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:\nBumps [github.com/ulikunitz/xz](https://github.com/ulikunitz/xz) from 0.5.11 to 0.5.14.\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/ulikunitz/xz/commit/7184815834c4777e8fa665946721d5fe114c2c35\"><code>7184815</code></a> Preparation of release v0.5.14</li>\n<li><a href=\"https://github.com/ulikunitz/xz/commit/88ddf1d0d98d688db65de034f48960b2760d2ae2\"><code>88ddf1d</code></a> Address Security Issue GHSA-jc7w-c686-c4v9</li>\n<li><a href=\"https://github.com/ulikunitz/xz/commit/c8314b8f21e9c5e25b52da07544cac14db277e89\"><code>c8314b8</code></a> Add new package xio with WriteCloserStack</li>\n<li><a href=\"https://github.com/ulikunitz/xz/commit/4f11dce79b9977ec2976a978d6c594ea1c23cf29\"><code>4f11dce</code></a> Update README.md and SECURITY.md to address security questions</li>\n<li><a href=\"https://github.com/ulikunitz/xz/commit/f56ebbfaa2400067dcda8ade26ce912c2873ca08\"><code>f56ebbf</code></a> TODO.md: fix a typo</li>\n<li>See full diff in <a href=\"https://github.com/ulikunitz/xz/compare/v0.5.11...v0.5.14\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/terraform-google-modules/terraform-google-network/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -47,7 +47,7 @@ require (\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n-\tgithub.com/ulikunitz/xz v0.5.11 // indirect\n+\tgithub.com/ulikunitz/xz v0.5.14 // indirect\n \tgithub.com/zclconf/go-cty v1.16.2 // indirect\n \tgo.yaml.in/yaml/v2 v2.4.2 // indirect\n \tgo.yaml.in/yaml/v3 v3.0.3 // indirect\n---\ntest/integration/go.sum\n@@ -105,8 +105,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=\n github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=\n github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=\n github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=\n-github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=\n-github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n+github.com/ulikunitz/xz v0.5.14 h1:uv/0Bq533iFdnMHZdRBTOlaNMdb1+ZxXIlHDZHIHcvg=\n+github.com/ulikunitz/xz v0.5.14/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -47,7 +47,7 @@ require (\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n-\tgithub.com/ulikunitz/xz v0.5.11 // indirect\n+\tgithub.com/ulikunitz/xz v0.5.14 // indirect\n \tgithub.com/zclconf/go-cty v1.16.2 // indirect\n \tgo.yaml.in/yaml/v2 v2.4.2 // indirect\n \tgo.yaml.in/yaml/v3 v1.2.5/go.mod // indirect\n---\ntest/integration/go.sum\n@@ -105,8 +105,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=\n github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=\n github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=\n github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=\n-github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=\n-github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n+github.com/ulikunitz/xz v0.5.14 h1:uv/0Bq533iFdnMHZdRBTOlaNMdb1+ZxXIlHDZHIHcvg=\n+github.com/ulikunitz/xz v0.5.14/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -47,7 +47,7 @@ require (\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n-\tgithub.com/ulikunitz/xz v0.5.11 // indirect\n+\tgithub.com/ulikunitz/xz v0.5.14 // indirect\n \tgithub.com/zclconf/go-cty v1.16.2 // indirect\n \tgo.yaml.in/yaml/v2 v2.4.2 // indirect\n \tgo.yaml.in/yaml/v3 v3.0.3 // indirect\n---\ntest/integration/go.sum\n@@ -105,8 +105,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=\n github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=\n github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=\n github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=\n-github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=\n-github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n+github.com/ulikunitz/xz v0.5.14 h1:uv/0Bq533iFdnMHZdRBTOlaNMdb1+ZxXIlHDZHIHcvg=\n+github.com/ulikunitz/xz github.com/zclconf/go-cty h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -47,7 +47,7 @@ require (\n \tgithub.com/tidwall/pretty v1.2.1 // indirect\n \tgithub.com/tidwall/sjson v1.2.5 // indirect\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n-\tgithub.com/ulikunitz/xz v0.5.11 // indirect\n+\tgithub.com/ulikunitz/xz v0.5.14 // indirect\n \tgithub.com/zclconf/go-cty v1.16.2 // indirect\n \tgo.yaml.in/yaml/v2 v2.4.2 // indirect\n \tgo.yaml.in/yaml/v3 v3.0.3 // indirect\n---\ntest/integration/go.sum\n@@ -105,8 +105,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=\n github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=\n -105,8 v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=\n github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=\n-github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=\n-github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n+github.com/ulikunitz/xz v0.5.14 h1:uv/0Bq533iFdnMHZdRBTOlaNMdb1+ZxXIlHDZHIHcvg=\n+github.com/ulikunitz/xz v0.5.14/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=\n github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=\n github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=\n github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=\n---\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 contains the following updates:\n\n| Package | Change | Age | Confidence |\n|---|---|---|---|\n| [github.com/stretchr/testify](https://redirect.github.com/stretchr/testify) | `v1.11.0` -> `v1.11.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>stretchr/testify (github.com/stretchr/testify)</summary>\n\n### [`v1.11.1`](https://redirect.github.com/stretchr/testify/releases/tag/v1.11.1)\n\n[Compare Source](https://redirect.github.com/stretchr/testify/compare/v1.11.0...v1.11.1)\n\nThis release fixes [#​1785](https://redirect.github.com/stretchr/testify/issues/1785) introduced in v1.11.0 where expected argument values implementing the stringer interface (`String() string`) with a method which mutates their value, when passed to mock.Mock.On (`m.On(\"Method\", <expected>).Return()`) or actual argument values passed to mock.Mock.Called may no longer match one another where they previously did match. The behaviour prior to v1.11.0 where the stringer is always called is restored. Future testify releases may not call the stringer method at all in this case.\n\n#### What's Changed\n\n- Backport [#​1786](https://redirect.github.com/stretchr/testify/issues/1786) to release/1.11: mock: revert to pre-v1.11.0 argument matching behavior for mutating stringers by [@​brackendawson](https://redirect.github.com/brackendawson) in [#​1788](https://redirect.github.com/stretchr/testify/pull/1788)\n\n**Full Changelog**: <https://github.com/stretchr/testify/compare/v1.11.0...v1.11.1>\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45MS4xIiwidXBkYXRlZEluVmVyIjoiNDEuOTEuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -7,37 +7,24 @@ toolchain go1.24.6\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n-\tgithub.com/stretchr/testify v1.11.0\n+\tgithub.com/stretchr/testify v1.11.1\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n-\tcloud.google.com/go v0.116.0 // indirect\n-\tcloud.google.com/go/compute v1.28.3 // indirect\n-\tcloud.google.com/go/compute/metadata v0.5.2 // indirect\n-\tcloud.google.com/go/iam v1.2.2 // indirect\n-\tcloud.google.com/go/storage v1.47.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n \tgithub.com/alexflint/go-filemutex v1.3.0 // indirect\n \tgithub.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect\n-\tgithub.com/aws/aws-sdk-go v1.45.5 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n \tgithub.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect\n \tgithub.com/go-errors/errors v1.5.0 // indirect\n \tgithub.com/go-openapi/jsonpointer v0.21.0 // indirect\n \tgithub.com/go-openapi/jsonreference v0.20.2 // indirect\n \tgithub.com/go-openapi/swag v0.23.0 // indirect\n-\tgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect\n-\tgithub.com/golang/protobuf v1.5.4 // indirect\n \tgithub.com/google/gnostic-models v0.6.9 // indirect\n \tgithub.com/google/go-cmp v0.7.0 // indirect\n-\tgithub.com/google/s2a-go v0.1.8 // indirect\n-\tgithub.com/google/uuid v1.6.0 // indirect\n-\tgithub.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect\n-\tgithub.com/googleapis/gax-go/v2 v2.14.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.9 // indirect\n \tgithub.com/hashicorp/go-getter/v2 v2.2.3 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n@@ -47,7 +34,6 @@ require (\n \tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d // indirect\n \tgithub.com/hashicorp/terraform-json v0.25.0 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n-\tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n \tgithub.com/josharian/intern v1.0.0 // indirect\n \tgithub.com/klauspost/compress v1.16.7 // indirect\n \tgithub.com/mailru/easyjson v0.7.7 // indirect\n@@ -63,27 +49,17 @@ require (\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.16.2 // indirect\n-\tgo.opencensus.io v0.24.0 // indirect\n \tgo.yaml.in/yaml/v2 v2.4.2 // indirect\n \tgo.yaml.in/yaml/v3 v3.0.3 // indirect\n \tgolang.org/x/crypto v0.39.0 // indirect\n \tgolang.org/x/mod v0.26.0 // indirect\n \tgolang.org/x/net v0.41.0 // indirect\n-\tgolang.org/x/oauth2 v0.27.0 // indirect\n \tgolang.org/x/sync v0.15.0 // indirect\n \tgolang.org/x/sys v0.33.0 // indirect\n \tgolang.org/x/text v0.26.0 // indirect\n \tgolang.org/x/tools v0.34.0 // indirect\n-\tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n-\tgoogle.golang.org/api v0.206.0 // indirect\n-\tgoogle.golang.org/appengine v1.6.8 // indirect\n-\tgoogle.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect\n-\tgoogle.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/grpc v1.67.1 // indirect\n \tgoogle.golang.org/protobuf v1.36.1 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n \tk8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect\n \tsigs.k8s.io/kustomize/kyaml v0.20.0 // indirect\n-\tsigs.k8s.io/yaml v1.5.0 // indirect\n )\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -7,37 +7,24 @@ toolchain go1.24.6\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n-\tgithub.com/stretchr/testify v1.11.0\n+\tgithub.com/stretchr/testify v1.11.1\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n-\tcloud.google.com/go v0.116.0 // indirect\n-\tcloud.google.com/go/compute v1.28.3 // indirect\n-\tcloud.google.com/go/compute/metadata v0.5.2 // indirect\n-\tcloud.google.com/go/iam v1.2.2 // indirect\n-\tcloud.google.com/go/storage v1.47.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n \tgithub.com/alexflint/go-filemutex v1.3.0 // indirect\n \tgithub.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect\n-\tgithub.com/aws/aws-sdk-go v1.45.5 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n \tgithub.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect\n \tgithub.com/go-errors/errors v1.5.0 // indirect\n \tgithub.com/go-openapi/jsonpointer v0.21.0 // indirect\n \tgithub.com/go-openapi/jsonreference v0.20.2 // indirect\n \tgithub.com/go-openapi/swag v0.23.0 // indirect\n-\tgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect\n-\tgithub.com/golang/protobuf v1.5.4 // indirect\n \tgithub.com/google/gnostic-models v0.6.9 // indirect\n \tgithub.com/google/go-cmp v0.7.0 // indirect\n-\tgithub.com/google/s2a-go v0.1.8 // indirect\n-\tgithub.com/google/uuid v1.6.0 // indirect\n-\tgithub.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect\n-\tgithub.com/googleapis/gax-go/v2 v2.14.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.9 // indirect\n \tgithub.com/hashicorp/go-getter/v2 v2.2.3 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n@@ -47,7 +34,6 @@ require (\n \tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d // indirect\n \tgithub.com/hashicorp/terraform-json v0.25.0 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n-\tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n \tgithub.com/josharian/intern v1.0.0 // indirect\n \tgithub.com/klauspost/compress v1.16.7 // indirect\n \tgithub.com/mailru/easyjson v0.7.7 // indirect\n@@ -63,27 +49,17 @@ require (\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.16.2 // indirect\n-\tgo.opencensus.io v0.24.0 // indirect\n \tgo.yaml.in/yaml/v2 v2.4.2 // indirect\n \tgo.yaml.in/yaml/v3 v3.0.3 // indirect\n \tgolang.org/x/crypto v0.39.0 // indirect\n \tgolang.org/x/mod v0.26.0 // indirect\n \tgolang.org/x/net v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgolang.org/x/oauth2 v0.27.0 // indirect\n \tgolang.org/x/sync v0.15.0 // indirect\n \tgolang.org/x/sys v0.33.0 // indirect\n \tgolang.org/x/text v0.26.0 // indirect\n \tgolang.org/x/tools v0.34.0 // indirect\n-\tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n-\tgoogle.golang.org/api v0.206.0 // indirect\n-\tgoogle.golang.org/appengine v1.6.8 // indirect\n-\tgoogle.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect\n-\tgoogle.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/grpc v1.67.1 // indirect\n \tgoogle.golang.org/protobuf v1.36.1 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n \tk8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect\n \tsigs.k8s.io/kustomize/kyaml v0.20.0 // indirect\n-\tsigs.k8s.io/yaml v1.5.0 // indirect\n )\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -7,37 +7,24 @@ toolchain go1.24.6\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n-\tgithub.com/stretchr/testify v1.11.0\n+\tgithub.com/stretchr/testify v1.11.1\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n-\tcloud.google.com/go v0.116.0 // indirect\n-\tcloud.google.com/go/compute v1.28.3 // indirect\n-\tcloud.google.com/go/compute/metadata v0.5.2 // indirect\n-\tcloud.google.com/go/iam v1.2.2 // indirect\n-\tcloud.google.com/go/storage v1.47.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n \tgithub.com/alexflint/go-filemutex v1.3.0 // indirect\n \tgithub.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect\n-\tgithub.com/aws/aws-sdk-go v1.45.5 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n \tgithub.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect\n \tgithub.com/go-errors/errors v1.5.0 // indirect\n \tgithub.com/go-openapi/jsonpointer v0.21.0 // indirect\n \tgithub.com/go-openapi/jsonreference v0.20.2 // indirect\n \tgithub.com/go-openapi/swag v0.23.0 // indirect\n-\tgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect\n-\tgithub.com/golang/protobuf v1.5.4 // indirect\n \tgithub.com/google/gnostic-models v0.6.9 // indirect\n \tgithub.com/google/go-cmp v0.7.0 // indirect\n-\tgithub.com/google/s2a-go v0.1.8 // indirect\n-\tgithub.com/google/uuid v1.6.0 // indirect\n-\tgithub.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect\n-\tgithub.com/googleapis/gax-go/v2 v2.14.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.9 // indirect\n // v2.2.3 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n@@ -47,7 +34,6 @@ require (\n \tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d // indirect\n \tgithub.com/hashicorp/terraform-json v0.25.0 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n-\tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n \tgithub.com/josharian/intern v1.0.0 // indirect\n \tgithub.com/klauspost/compress v1.16.7 // indirect\n \tgithub.com/mailru/easyjson v0.7.7 // indirect\n@@ -63,27 +49,17 @@ require (\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.16.2 // indirect\n-\tgo.opencensus.io v0.24.0 // indirect\n \tgo.yaml.in/yaml/v2 v2.4.2 // indirect\n \tgo.yaml.in/yaml/v3 v3.0.3 // indirect\n \tgolang.org/x/crypto v0.39.0 // indirect\n \tgolang.org/x/mod v0.26.0 // indirect\n \tgolang.org/x/net v0.41.0 // indirect\n-\tgolang.org/x/oauth2 v0.27.0 // indirect\n \tgolang.org/x/sync v0.15.0 // indirect\n \tgolang.org/x/sys v0.33.0 // indirect\n \tgolang.org/x/text v0.26.0 // indirect\n \tgolang.org/x/tools v0.34.0 // indirect\n-\tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n-\tgoogle.golang.org/api v0.206.0 // indirect\n-\tgoogle.golang.org/appengine v1.6.8 // indirect\n-\tgoogle.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect\n-\tgoogle.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/grpc v1.67.1 // indirect\n \tgoogle.golang.org/protobuf v1.36.1 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n \tk8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect\n \tsigs.k8s.io/kustomize/kyaml v0.20.0 // indirect\n-\tsigs.k8s.io/yaml v1.5.0 // indirect\n )\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -7,37 +7,24 @@ toolchain go1.24.6\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8\n \tgithub.com/gruntwork-io/terratest v0.50.0\n-\tgithub.com/stretchr/testify v1.11.0\n+\tgithub.com/stretchr/testify v1.11.1\n \tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n-\tcloud.google.com/go v0.116.0 // indirect\n-\tcloud.google.com/go/compute v1.28.3 // indirect\n-\tcloud.google.com/go/compute/metadata v0.5.2 // indirect\n-\tcloud.google.com/go/iam v1.2.2 // indirect\n-\tcloud.google.com/go/storage v1.47.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n \tgithub.com/alexflint/go-filemutex v1.3.0 // indirect\n \tgithub.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect\n-\tgithub.com/aws/aws-sdk-go v1.45.5 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n \tgithub.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect\n \tgithub.com/go-errors/errors v1.5.0 // indirect\n \tgithub.com/go-openapi/jsonpointer v0.21.0 // indirect\n \tgithub.com/go-openapi/jsonreference v0.20.2 // indirect\n \tgithub.com/go-openapi/swag v0.23.0 // indirect\n-\tgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect\n-\tgithub.com/golang/protobuf v1.5.4 // indirect\n \tgithub.com/google/gnostic-models v0.6.9 // indirect\n \tgithub.com/google/go-cmp v0.7.0 indirect\n-\tgolang.org/x/xerrors indirect\n-\tgithub.com/google/s2a-go v0.1.8 // indirect\n-\tgithub.com/google/uuid v1.6.0 // indirect\n-\tgithub.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect\n-\tgithub.com/googleapis/gax-go/v2 v2.14.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.9 // indirect\n \tgithub.com/hashicorp/go-getter/v2 v2.2.3 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n@@ -47,7 +34,6 @@ require (\n \tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d // indirect\n \tgithub.com/hashicorp/terraform-json v0.25.0 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n-\tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n \tgithub.com/josharian/intern v1.0.0 // indirect\n \tgithub.com/klauspost/compress v1.16.7 // indirect\n \tgithub.com/mailru/easyjson v0.7.7 // indirect\n@@ -63,27 +49,17 @@ require (\n \tgithub.com/tmccombs/hcl2json v0.6.4 // indirect\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.16.2 // indirect\n-\tgo.opencensus.io v0.24.0 // indirect\n \tgo.yaml.in/yaml/v2 v2.4.2 // indirect\n \tgo.yaml.in/yaml/v3 v3.0.3 // indirect\n \tgolang.org/x/crypto v0.39.0 // indirect\n \tgolang.org/x/mod v0.26.0 // indirect\n \tgolang.org/x/net v0.41.0 // indirect\n-\tgolang.org/x/oauth2 v0.27.0 // indirect\n \tgolang.org/x/sync v0.15.0 // indirect\n \tgolang.org/x/sys v0.33.0 // indirect\n \tgolang.org/x/text v0.26.0 // indirect\n \tgolang.org/x/tools v0.34.0 // indirect\n-\tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n-\tgoogle.golang.org/api v0.206.0 // indirect\n-\tgoogle.golang.org/appengine v1.6.8 // indirect\n-\tgoogle.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect\n-\tgoogle.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect\n-\tgoogle.golang.org/grpc v1.67.1 // indirect\n \tgoogle.golang.org/protobuf v1.36.1 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n \tk8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect\n \tsigs.k8s.io/kustomize/kyaml v0.20.0 // indirect\n-\tsigs.k8s.io/yaml v1.5.0 // indirect\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:\nfix #632 \n\n---\n\nChoice A:\nmodules/network-connectivity-center/README.md\n@@ -23,12 +23,12 @@ An extensive example that also contains the creation and attachment of multiple\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n | export\\_psc | Whether Private Service Connect transitivity is enabled for the hub | `bool` | `false` | no |\n-| hybrid\\_spokes | VLAN attachments and VPN Tunnels that are associated with the spoke. Type must be one of `interconnect` and `vpn`. | <pre>map(object({<br> location = string<br> uris = set(string)<br> site_to_site_data_transfer = optional(bool, false)<br> type = string<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |\n+| hybrid\\_spokes | VLAN attachments and VPN Tunnels that are associated with the spoke. Type must be one of `interconnect` and `vpn`. | <pre>map(object({<br> location = string<br> uris = set(string)<br> site_to_site_data_transfer = optional(bool, false)<br> type = string<br> description = optional(string)<br> labels = optional(map(string))<br> include_import_ranges = optional(list(string), [])<br> }))</pre> | `{}` | no |\n | ncc\\_hub\\_description | The description of the NCC Hub | `string` | `null` | no |\n | ncc\\_hub\\_labels | These labels will be added the NCC hub | `map(string)` | `{}` | no |\n | ncc\\_hub\\_name | The Name of the NCC Hub | `string` | n/a | yes |\n | project\\_id | Project ID of the project that holds the network. | `string` | n/a | yes |\n-| router\\_appliance\\_spokes | Router appliance instances that are associated with the spoke. | <pre>map(object({<br> instances = set(object({<br> virtual_machine = string<br> ip_address = string<br> }))<br> location = string<br> site_to_site_data_transfer = optional(bool, false)<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |\n+| router\\_appliance\\_spokes | Router appliance instances that are associated with the spoke. | <pre>map(object({<br> instances = set(object({<br> virtual_machine = string<br> ip_address = string<br> }))<br> location = string<br> site_to_site_data_transfer = optional(bool, false)<br> description = optional(string)<br> labels = optional(map(string))<br> include_import_ranges = optional(list(string), [])<br> }))</pre> | `{}` | no |\n | spoke\\_labels | These labels will be added to all NCC spokes | `map(string)` | `{}` | no |\n | vpc\\_spokes | VPC network that is associated with the spoke | <pre>map(object({<br> uri = string<br> exclude_export_ranges = optional(set(string), [])<br> include_export_ranges = optional(set(string), [])<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |\n \n---\nmodules/network-connectivity-center/main.tf\n@@ -68,6 +68,7 @@ resource \"google_network_connectivity_spoke\" \"hybrid_spoke\" {\n content {\n uris = each.value.uris\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n+ include_import_ranges = each.value.include_import_ranges\n }\n }\n \n@@ -76,6 +77,7 @@ resource \"google_network_connectivity_spoke\" \"hybrid_spoke\" {\n content {\n uris = each.value.uris\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n+ include_import_ranges = each.value.include_import_ranges\n }\n }\n }\n@@ -99,6 +101,7 @@ resource \"google_network_connectivity_spoke\" \"router_appliance_spoke\" {\n }\n }\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n+ include_import_ranges = each.value.include_import_ranges\n \n }\n }\n---\nmodules/network-connectivity-center/variables.tf\n@@ -62,6 +62,7 @@ variable \"hybrid_spokes\" {\n type = string\n description = optional(string)\n labels = optional(map(string))\n+ include_import_ranges = optional(list(string), [])\n }))\n default = {}\n }\n@@ -77,6 +78,7 @@ variable \"router_appliance_spokes\" {\n site_to_site_data_transfer = optional(bool, false)\n description = optional(string)\n labels = optional(map(string))\n+ include_import_ranges = optional(list(string), [])\n }))\n default = {}\n }\n---\nmodules/network-connectivity-center/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.2, < 8\"\n+ version = \">= 6.49, < 8\"\n \n }\n }\n---\n\n\n---\n\nChoice B:\nmodules/network-connectivity-center/README.md\n@@ -23,12 +23,12 @@ An extensive example that also contains the creation and attachment of multiple\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n | export\\_psc | Whether Private Service Connect transitivity is enabled for the hub | `bool` | `false` | no |\n-| hybrid\\_spokes | VLAN attachments and VPN Tunnels that are associated with the spoke. Type must be one of `interconnect` and `vpn`. | <pre>map(object({<br> location = string<br> uris = set(string)<br> site_to_site_data_transfer = optional(bool, false)<br> type = string<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |\n+| hybrid\\_spokes | VLAN attachments and VPN Tunnels that are associated with the spoke. Type must be one of `interconnect` and `vpn`. | <pre>map(object({<br> location = string<br> uris = set(string)<br> site_to_site_data_transfer = optional(bool, false)<br> type = string<br> description = optional(string)<br> labels = optional(map(string))<br> include_import_ranges = optional(list(string), [])<br> }))</pre> | `{}` | no |\n | ncc\\_hub\\_description | The description of the NCC Hub | `string` | `null` | no |\n | ncc\\_hub\\_labels | These labels will be added the NCC hub | `map(string)` | `{}` | no |\n | ncc\\_hub\\_name | The Name of the NCC Hub | `string` | n/a | yes |\n | project\\_id | Project ID of the project that holds the network. | `string` | n/a | yes |\n-| router\\_appliance\\_spokes | Router appliance instances that are associated with the spoke. | <pre>map(object({<br> instances = set(object({<br> virtual_machine = string<br> ip_address = string<br> }))<br> location = string<br> site_to_site_data_transfer = optional(bool, false)<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |\n+| router\\_appliance\\_spokes | Router appliance instances that are associated with the spoke. | <pre>map(object({<br> instances = set(object({<br> virtual_machine = string<br> ip_address = string<br> }))<br> location = string<br> site_to_site_data_transfer = optional(bool, false)<br> description = optional(string)<br> labels = optional(map(string))<br> include_import_ranges = optional(list(string), [])<br> }))</pre> | `{}` | no |\n | spoke\\_labels | These labels will be added to all NCC spokes | `map(string)` | `{}` | no |\n | vpc\\_spokes | VPC network that is associated with the spoke | <pre>map(object({<br> uri = string<br> exclude_export_ranges = optional(set(string), [])<br> include_export_ranges = \n [])<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |\n \n---\nmodules/network-connectivity-center/main.tf\n@@ -68,6 +68,7 @@ resource \"google_network_connectivity_spoke\" \"hybrid_spoke\" {\n content {\n uris = each.value.uris\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n+ include_import_ranges = each.value.include_import_ranges\n }\n }\n \n@@ -76,6 +77,7 @@ resource \"google_network_connectivity_spoke\" \"hybrid_spoke\" {\n content {\n uris = each.value.uris\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n+ include_import_ranges = each.value.include_import_ranges\n }\n }\n }\n@@ -99,6 +101,7 @@ resource \"google_network_connectivity_spoke\" \"router_appliance_spoke\" {\n }\n }\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n+ include_import_ranges = each.value.include_import_ranges\n \n }\n }\n---\nmodules/network-connectivity-center/variables.tf\n@@ -62,6 +62,7 @@ variable \"hybrid_spokes\" {\n type = string\n description = optional(string)\n labels = optional(map(string))\n+ include_import_ranges = optional(list(string), [])\n }))\n default = {}\n }\n@@ -77,6 +78,7 @@ variable \"router_appliance_spokes\" {\n site_to_site_data_transfer = optional(bool, false)\n description = optional(string)\n labels = optional(map(string))\n+ include_import_ranges = optional(list(string), [])\n }))\n default = {}\n }\n---\nmodules/network-connectivity-center/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.2, < 8\"\n+ version = \">= 6.49, < 8\"\n \n }\n }\n---\n\n\n---\n\nChoice C:\nmodules/network-connectivity-center/README.md\n@@ -23,12 +23,12 @@ An extensive example that also contains the creation and attachment of multiple\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n | export\\_psc | Whether Private Service Connect transitivity is enabled for the hub | `bool` | `false` | no |\n-| hybrid\\_spokes | VLAN attachments and VPN Tunnels that are associated with the spoke. Type must be one of `interconnect` and `vpn`. | <pre>map(object({<br> location = string<br> uris = set(string)<br> site_to_site_data_transfer = optional(bool, false)<br> type = string<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |\n+| hybrid\\_spokes | VLAN attachments and VPN Tunnels that are associated with the spoke. Type must be one of `interconnect` and `vpn`. | <pre>map(object({<br> location = string<br> uris = set(string)<br> site_to_site_data_transfer = optional(bool, false)<br> type = string<br> description = optional(string)<br> labels = optional(map(string))<br> include_import_ranges = optional(list(string), [])<br> }))</pre> | `{}` | no |\n | ncc\\_hub\\_description | The description of the NCC Hub | `string` | `null` | no |\n | ncc\\_hub\\_labels | These labels will be added the NCC hub | `map(string)` | `{}` | no |\n | ncc\\_hub\\_name | The Name of the NCC Hub | `string` | n/a | yes |\n | project\\_id | Project ID of the project that holds the network. | `string` | n/a | yes |\n-| router\\_appliance\\_spokes | Router appliance instances that are associated with the spoke. | <pre>map(object({<br> instances = set(object({<br> virtual_machine = string<br> ip_address = string<br> }))<br> location = string<br> site_to_site_data_transfer = optional(bool, false)<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |\n+| router\\_appliance\\_spokes | Router appliance instances that are associated with the spoke. | <pre>map(object({<br> instances = set(object({<br> virtual_machine = string<br> ip_address = string<br> }))<br> location = string<br> site_to_site_data_transfer = optional(bool, false)<br> description = optional(string)<br> labels = optional(map(string))<br> include_import_ranges = optional(list(string), [])<br> }))</pre> | `{}` | no |\n | spoke\\_labels | These labels will be added to all NCC spokes | `map(string)` | `{}` | no |\n | vpc\\_spokes | VPC network that is associated with the spoke | <pre>map(object({<br> uri = string<br> exclude_export_ranges = optional(set(string), [])<br> include_export_ranges = optional(set(string), [])<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |\n \n---\nmodules/network-connectivity-center/main.tf\n@@ -68,6 +68,7 @@ resource \"google_network_connectivity_spoke\" \"hybrid_spoke\" {\n content {\n uris = each.value.uris\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n+ include_import_ranges = each.value.include_import_ranges\n }\n }\n \n@@ -76,6 +77,7 @@ resource \"google_network_connectivity_spoke\" \"hybrid_spoke\" {\n content {\n uris = each.value.uris\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n+ include_import_ranges = each.value.include_import_ranges\n }\n }\n }\n@@ -99,6 +101,7 @@ resource \"google_network_connectivity_spoke\" \"router_appliance_spoke\" {\n }\n }\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n+ include_import_ranges = each.value.include_import_ranges\n \n }\n }\n---\nmodules/network-connectivity-center/variables.tf\n@@ -62,6 +62,7 @@ variable \"hybrid_spokes\" {\n type = string\n description = optional(string)\n labels = optional(map(string))\n+ include_import_ranges = optional(list(string), [])\n }))\n default = {}\n }\n@@ -77,6 +78,7 @@ variable \"router_appliance_spokes\" {\n site_to_site_data_transfer = optional(bool, false)\n description = optional(string)\n labels = optional(map(string))\n+ include_import_ranges = optional(list(string), [])\n }))\n default = {}\n }\n---\nmodules/network-connectivity-center/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.2, < 8\"\n+ version = \">= 6.49, < 8\"\n \n }\n }\n---\n\n\n---\n\nChoice D:\nmodules/network-connectivity-center/README.md\n@@ -23,12 +23,12 @@ An extensive example that also contains the creation and attachment of multiple\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n | export\\_psc | Whether Private Service Connect transitivity is enabled for the hub | `bool` | `false` | no |\n-| hybrid\\_spokes | VLAN attachments and VPN Tunnels that are associated with the spoke. Type must be one of `interconnect` and `vpn`. | <pre>map(object({<br> location = string<br> uris = set(string)<br> site_to_site_data_transfer = optional(bool, false)<br> type = string<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |\n+| hybrid\\_spokes | VLAN attachments and VPN Tunnels that are associated with the spoke. Type must be one of `interconnect` and `vpn`. | <pre>map(object({<br> location = string<br> uris = set(string)<br> site_to_site_data_transfer = optional(bool, false)<br> type = string<br> description = optional(string)<br> labels = optional(map(string))<br> include_import_ranges = optional(list(string), [])<br> }))</pre> | `{}` | no |\n | ncc\\_hub\\_description | The description of the NCC Hub | `string` | `null` | no |\n | ncc\\_hub\\_labels | These labels will be added the NCC hub | `map(string)` | `{}` | no |\n | ncc\\_hub\\_name | The Name of the NCC Hub | `string` | n/a | yes |\n | project\\_id | Project ID of the project that holds the network. | `string` | n/a | yes |\n-| router\\_appliance\\_spokes | Router appliance instances that are associated with the spoke. | <pre>map(object({<br> instances = set(object({<br> virtual_machine = string<br> ip_address = string<br> }))<br> location = string<br> site_to_site_data_transfer = optional(bool, false)<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |\n+| router\\_appliance\\_spokes | Router appliance instances that are associated with the spoke. | <pre>map(object({<br> instances = set(object({<br> virtual_machine = string<br> ip_address = string<br> }))<br> location = string<br> site_to_site_data_transfer = optional(bool, false)<br> description = optional(string)<br> labels = optional(map(string))<br> include_import_ranges = optional(list(string), [])<br> }))</pre> | `{}` | no |\n | spoke\\_labels | These labels will be added to all NCC spokes | `map(string)` | `{}` | no |\n | vpc\\_spokes | VPC network that is associated with the spoke | <pre>map(object({<br> uri = string<br> exclude_export_ranges = optional(set(string), [])<br> include_export_ranges = optional(set(string), [])<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |\n \n---\nmodules/network-connectivity-center/main.tf\n@@ -68,6 +68,7 @@ resource \"google_network_connectivity_spoke\" \"hybrid_spoke\" {\n content {\n uris = each.value.uris\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n+ include_import_ranges = each.value.include_import_ranges\n }\n }\n \n@@ -76,6 +77,7 @@ resource \"google_network_connectivity_spoke\" \"hybrid_spoke\" {\n content {\n uris = each.value.uris\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n+ include_import_ranges = each.value.include_import_ranges\n }\n }\n }\n@@ -99,6 +101,7 @@ resource \"google_network_connectivity_spoke\" \"router_appliance_spoke\" {\n }\n }\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n+ include_import_ranges = each.value.include_import_ranges\n \n }\n }\n---\nmodules/network-connectivity-center/variables.tf\n@@ -62,6 +62,7 @@ variable \"hybrid_spokes\" {\n type = string\n description = optional(string)\n labels = optional(map(string))\n+ include_import_ranges = optional(list(string), [])\n }))\n default = {}\n }\n@@ -77,6 +78,7 @@ variable \"router_appliance_spokes\" {\n site_to_site_data_transfer = optional(bool, false)\n description = optional(string)\n labels = optional(map(string))\n+ include_import_ranges }\n---\n = optional(list(string), [])\n }))\n default = {}\n }\n---\nmodules/network-connectivity-center/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.2, < 8\"\n+ version = \">= 6.49, < 8\"\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:\nThis PR contains the following updates:\n\n| Package | Type | Update | Change | Pending |\n|---|---|---|---|---|\n| [terraform-google-modules/cloud-dns/google](https://registry.terraform.io/modules/terraform-google-modules/cloud-dns/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-dns)) | module | major | `~> 5.0` -> `~> 6.0` | `6.1.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-cloud-dns (terraform-google-modules/cloud-dns/google)</summary>\n\n### [`v6.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-dns/blob/HEAD/CHANGELOG.md#600-2025-04-29)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-dns/compare/v5.3.0...v6.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- Remove google-beta provider where possible ([#​115](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-dns/issues/115))\n\n##### Bug Fixes\n\n- Remove google-beta provider where possible ([#​115](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-dns/issues/115)) ([b2aef64](https://redirect.github.com/terraform-google-modules/terraform-google-cloud-dns/commit/b2aef64ca4c6431bab273d177c62fcd43e701d97))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC43LjEiLCJ1cGRhdGVkSW5WZXIiOiI0MS44Mi43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nmodules/private-service-connect/dns.tf\n@@ -20,7 +20,7 @@\n \n module \"googleapis\" {\n = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}apis\"\n@@ -53,7 +53,7 @@ module \"googleapis\" {\n \n module \"gcr\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}gcr\"\n@@ -86,7 +86,7 @@ module \"gcr\" {\n \n module \"pkg_dev\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}pkg-dev\"\n---\n\n\n---\n\nChoice B:\nmodules/private-service-connect/dns.tf\n@@ -20,7 +20,7 @@\n \n module \"googleapis\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}apis\"\n@@ -53,7 +53,7 @@ module \"googleapis\" {\n \n module \"gcr\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}gcr\"\n@@ -86,7 +86,7 @@ module \"gcr\" {\n \n module \"pkg_dev\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}pkg-dev\"\n---\n\n\n---\n\nChoice C:\nmodules/private-service-connect/dns.tf\n@@ -20,7 +20,7 @@\n \n module \"googleapis\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 5.0\"\n+ version \"terraform-google-modules/cloud-dns/google\"\n- = \"~> 6.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}apis\"\n@@ -53,7 +53,7 @@ module \"googleapis\" {\n \n module \"gcr\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}gcr\"\n@@ -86,7 +86,7 @@ module \"gcr\" {\n \n module \"pkg_dev\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}pkg-dev\"\n---\n\n\n---\n\nChoice D:\nmodules/private-service-connect/dns.tf\n@@ -20,7 +20,7 @@\n \n module \"googleapis\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}apis\"\n@@ -53,7 +53,7 @@ module \"googleapis\" {\n \n module \"gcr\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}gcr\"\n@@ -86,7 +86,7 @@ module \"gcr\" {\n \n module \"pkg_dev\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}pkg-dev\"\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://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nYou can trigger a rebase of this PR by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/terraform-google-modules/terraform-google-network/network/alerts).\n\n</details>\n\n> **Note**\n> Automatic rebases have been disabled on this pull request as it has been open for over 30 days.\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -1,8 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.22.0\n-\n-toolchain go1.22.8\n+go 1.23.0\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n@@ -13,8 +11,7 @@ require (\n \n require (\n \tcloud.google.com/go v0.110.7 // indirect\n-\tcloud.google.com/go/compute v1.23.0 // indirect\n-\tcloud.google.com/go/compute/metadata v0.2.3 // indirect\n+\tcloud.google.com/go/compute/metadata v0.3.0 // indirect\n \tcloud.google.com/go/iam v1.1.2 // indirect\n \tcloud.google.com/go/storage v1.33.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n@@ -65,7 +62,7 @@ require (\n \tgolang.org/x/crypto v0.32.0 // indirect\n \tgolang.org/x/mod v0.21.0 // indirect\n \tgolang.org/x/net v0.34.0 // indirect\n-\tgolang.org/x/oauth2 v0.12.0 // indirect\n+\tgolang.org/x/oauth2 v0.27.0 // indirect\n \tgolang.org/x/sync v0.10.0 // indirect\n \tgolang.org/x/sys v0.29.0 // indirect\n \tgolang.org/x/text v0.21.0 // indirect\n---\ntest/integration/go.sum\n@@ -174,13 +174,12 @@ cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63\n cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=\n cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU=\n cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE=\n-cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=\n-cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=\n cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=\n cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=\n cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=\n-cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=\n cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=\n+cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=\n+cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=\n cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY=\n cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=\n cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=\n@@ -1153,8 +1152,8 @@ golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec\n golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=\n golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=\n golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=\n-golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=\n-golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=\n+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=\n+golang.org/x/oauth2 // h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=\n golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -1,8 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.22.0\n-\n-toolchain go1.22.8\n+go 1.23.0\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n@@ -13,8 +11,7 @@ require (\n \n require (\n \tcloud.google.com/go v0.110.7 // indirect\n-\tcloud.google.com/go/compute v1.23.0 // indirect\n-\tcloud.google.com/go/compute/metadata v0.2.3 // indirect\n+\tcloud.google.com/go/compute/metadata v0.3.0 // indirect\n \tcloud.google.com/go/iam v1.1.2 // indirect\n \tcloud.google.com/go/storage v1.33.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n@@ -65,7 +62,7 @@ require (\n \tgolang.org/x/crypto v0.32.0 // indirect\n \tgolang.org/x/mod v0.21.0 // indirect\n \tgolang.org/x/net v0.34.0 // indirect\n-\tgolang.org/x/oauth2 v0.12.0 // indirect\n+\tgolang.org/x/oauth2 v0.27.0 // indirect\n \tgolang.org/x/sync v0.10.0 // indirect\n \tgolang.org/x/sys v0.29.0 // indirect\n \tgolang.org/x/text v0.21.0 // indirect\n---\ntest/integration/go.sum\n@@ -174,13 +174,12 @@ cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63\n cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=\n cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU=\n cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE=\n-cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=\n-cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=\n cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=\n cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=\n cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=\n-cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=\n cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=\n+cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=\n+cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=\n cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY=\n cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=\n cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=\n@@ -1153,8 +1152,8 @@ golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec\n golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=\n golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=\n golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=\n-golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=\n-golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=\n+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=\n+golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=\n golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -1,8 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.22.0\n-\n-toolchain go1.22.8\n+go 1.23.0\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n@@ -13,8 +11,7 @@ require (\n \n require (\n \tcloud.google.com/go v0.110.7 // indirect\n-\tcloud.google.com/go/compute v1.23.0 // indirect\n-\tcloud.google.com/go/compute/metadata v0.2.3 // indirect\n+\tcloud.google.com/go/compute/metadata v0.3.0 // indirect\n \tcloud.google.com/go/iam v1.1.2 // indirect\n \tcloud.google.com/go/storage v1.33.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n@@ -65,7 +62,7 @@ require (\n \tgolang.org/x/crypto v0.32.0 // indirect\n \tgolang.org/x/mod v0.21.0 // indirect\n \tgolang.org/x/net v0.34.0 // indirect\n-\tgolang.org/x/oauth2 v0.12.0 // indirect\n+\tgolang.org/x/oauth2 v0.27.0 // indirect\n \tgolang.org/x/sync v0.10.0 // indirect\n \tgolang.org/x/sys v0.29.0 // indirect\n \tgolang.org/x/text v0.21.0 // indirect\n---\ntest/integration/go.sum\n@@ -174,13 +174,12 @@ cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63\n cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=\n cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU=\n cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE=\n-cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=\n-cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=\n cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=\n cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=\n cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=\n-cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=\n cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=\n+cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=\n+cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=\n cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY=\n cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=\n cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=\n@@ -1153,8 +1152,8 @@ golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec\n golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=\n golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=\n golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=\n-golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=\n-golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=\n+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=\n+golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=\n golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -1,8 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.22.0\n-\n-toolchain go1.22.8\n+go h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n---\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n@@ -13,8 +11,7 @@ require (\n \n require (\n \tcloud.google.com/go v0.110.7 // indirect\n-\tcloud.google.com/go/compute v1.23.0 // indirect\n-\tcloud.google.com/go/compute/metadata v0.2.3 // indirect\n+\tcloud.google.com/go/compute/metadata v0.3.0 // indirect\n \tcloud.google.com/go/iam v1.1.2 // indirect\n \tcloud.google.com/go/storage v1.33.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n@@ -65,7 +62,7 @@ require (\n \tgolang.org/x/crypto v0.32.0 // indirect\n \tgolang.org/x/mod v0.21.0 // indirect\n \tgolang.org/x/net v0.34.0 // indirect\n-\tgolang.org/x/oauth2 v0.12.0 // indirect\n+\tgolang.org/x/oauth2 v0.27.0 // indirect\n \tgolang.org/x/sync v0.10.0 // indirect\n \tgolang.org/x/sys v0.29.0 // indirect\n \tgolang.org/x/text v0.21.0 // indirect\n---\ntest/integration/go.sum\n@@ -174,13 +174,12 @@ cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63\n cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=\n cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU=\n cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE=\n-cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=\n-cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=\n cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=\n cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=\n cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=\n-cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=\n cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=\n+cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=\n+cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=\n cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY=\n cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=\n cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=\n@@ -1153,8 +1152,8 @@ golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec\n golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=\n golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=\n golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=\n-golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=\n-golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=\n+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=\n+golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=\n golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\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 contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [terraform-google-modules/vpn/google](https://registry.terraform.io/modules/terraform-google-modules/vpn/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-vpn)) | module | major | `~> 5.0` -> `~> 6.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-vpn (terraform-google-modules/vpn/google)</summary>\n\n### [`v6.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/blob/HEAD/CHANGELOG.md#600-2025-06-04)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/compare/v5.0.0...v6.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TPG beta:** add support for BGP Route Policy in vpn\\_ha sub-module ([#​188](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/issues/188))\n\n##### Features\n\n- **TPG beta:** add support for BGP Route Policy in vpn\\_ha sub-module ([#​188](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/issues/188)) ([8c44816](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/commit/8c4481669153dd8e16f688742d16293218a32c49))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC42Mi4xIiwidXBkYXRlZEluVmVyIjoiNDEuODIuNyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\nexamples/network_connectivity_center/main.tf\n@@ -122,7 +122,7 @@ module \"vpn_spoke_local_vpc\" {\n \n module \"remote_to_local_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n \n project_id = var.project_id\n region = var.vpn_region\n@@ -160,7 +160,7 @@ module \"remote_to_local_vpn\" {\n \n module \"local_to_remote_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n \n project_id = var.project_id\n region = var.vpn_region\n---\n\n\n---\n\nChoice B:\nexamples/network_connectivity_center/main.tf\n@@ -122,7 +122,7 @@ module \"vpn_spoke_local_vpc\" {\n \n module \"remote_to_local_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n \n project_id = var.project_id\n region = var.vpn_region\n@@ -160,7 +160,7 @@ module \"remote_to_local_vpn\" {\n \n module \"local_to_remote_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n \n project_id = var.project_id\n region = var.vpn_region\n---\n\n\n---\n\nChoice C:\nexamples/network_connectivity_center/main.tf\n@@ -122,7 +122,7 @@ module \"vpn_spoke_local_vpc\" {\n \n module \"remote_to_local_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n \n project_id = var.project_id\n region = var.vpn_region\n@@ -160,7 +160,7 @@ module \"remote_to_local_vpn\" {\n \n module \"local_to_remote_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n \n project_id +160,7 = var.project_id\n region = var.vpn_region\n---\n\n\n---\n\nChoice D:\nexamples/network_connectivity_center/main.tf\n@@ -122,7 +122,7 @@ module \"vpn_spoke_local_vpc\" {\n \n module \"remote_to_local_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n \n project_id = var.project_id\n region = var.vpn_region\n@@ -160,7 +160,7 @@ version \"remote_to_local_vpn\" {\n \n module \"local_to_remote_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 5.0\"\n+ version = \"~> 6.0\"\n \n project_id = var.project_id\n region = var.vpn_region\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:\nexamples/packet_mirroring/outputs.tf\n@@ -26,6 +26,6 @@ output \"collector_ilb\" {\n }\n \n output value {\n- value = google_compute_packet_mirroring.default.mirrored_resources[0].instances[0].url\n+ value = google_compute_instance.mirror.id\n description = \"The VM instance\"\n }\n---\n\n\n---\n\nChoice B:\nexamples/packet_mirroring/outputs.tf\n@@ -26,6 +26,6 @@ output \"collector_ilb\" {\n }\n \n output \"instance\" = value = google_compute_packet_mirroring.default.mirrored_resources[0].instances[0].url\n+ value = google_compute_instance.mirror.id\n description = \"The VM instance\"\n }\n---\n\n\n---\n\nChoice C:\nexamples/packet_mirroring/outputs.tf\n@@ -26,6 +26,6 @@ output \"collector_ilb\" {\n }\n \n output \"instance\" {\n- value = google_compute_packet_mirroring.default.mirrored_resources[0].instances[0].url\n+ value = google_compute_instance.mirror.id\n description = \"The VM instance\"\n }\n---\n\n\n---\n\nChoice D:\n -26,6 +26,6 @@ output \"collector_ilb\" {\n }\n \n output \"instance\" {\n- value = google_compute_packet_mirroring.default.mirrored_resources[0].instances[0].url\n+ value = google_compute_instance.mirror.id\n description = \"The VM instance\"\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:\nThis PR contains the following updates:\n\n| Package | Type | Update | Change | Pending |\n|---|---|---|---|---|\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 4.64, < 7` -> `>= 4.64, < 8` | `7.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 6.19, < 7` -> `>= 6.19, < 8` | `7.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 4.25.0, < 7` -> `>= 4.25.0, < 8` | `7.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 3.83, < 7` -> `>= 3.83, < 8` | `7.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 5.8, < 7` -> `>= 5.8, < 8` | `7.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 4.65, < 7` -> `>= 4.65, < 8` | `7.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 6.28, < 7` -> `>= 6.28, < 8` | `7.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 6.2, < 7` -> `>= 6.2, < 8` | `7.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 6.18, < 7` -> `>= 6.18, < 8` | `7.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 3.33, < 7` -> `>= 3.33, < 8` | `7.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 2.12, < 7` -> `>= 2.12, < 8` | `7.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 4.64, < 7` -> `>= 4.64, < 8` | `7.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 6.19, < 7` -> `>= 6.19, < 8` | `7.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 3.62, < 7` -> `>= 3.62, < 8` | `7.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 2.19, < 7` -> `>= 2.19, < 8` | `7.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 3.0, < 7` -> `>= 3.0, < 8` | `7.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 5.8, < 7` -> `>= 5.8, < 8` | `7.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 4.65, < 7` -> `>= 4.65, < 8` | `7.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 6.28, < 7` -> `>= 6.28, < 8` | `7.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 6.18, < 7` -> `>= 6.18, < 8` | `7.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 2.12, < 7` -> `>= 2.12, < 8` | `7.0.1` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>hashicorp/terraform-provider-google (google)</summary>\n\n### [`v7.0.0`](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v6.49.2...v7.0.0)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v6.49.2...v7.0.0)\n\n</details>\n\n<details>\n<summary>hashicorp/terraform-provider-google-beta (google-beta)</summary>\n\n### [`v7.0.0`](https://redirect.github.com/hashicorp/terraform-provider-google-beta/compare/v6.49.2...v7.0.0)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google-beta/compare/v6.49.2...v7.0.0)\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS44Mi43IiwidXBkYXRlZEluVmVyIjoiNDEuODIuNyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\nexamples/packet_mirroring/outputs.tf\n@@ -26,6 +26,6 @@ output \"collector_ilb\" {\n }\n \n output \"instance\" {\n- value = google_compute_packet_mirroring.default.mirrored_resources[0].instances[0].url\n+ value = google_compute_instance.mirror.id\n description = \"The VM instance\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 7\"\n+ version = \">= < 8\"\n }\n }\n \n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 7\"\n+ version = \">= 2.12, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.12, < 7\"\n+ version = \">= 2.12, < 8\"\n }\n }\n \n---\nmodules/firewall-rules/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.33, < 7\"\n+ version = \">= 3.33, < 8\"\n }\n }\n \n---\nmodules/hierarchical-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.18, < 7\"\n+ version = \">= 6.18, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.18, < 7\"\n+ version = \">= 6.18, < 8\"\n }\n }\n \n---\nmodules/network-connectivity-center/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.2, < 7\"\n+ version = \">= 6.2, < 8\"\n \n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.28, < 7\"\n+ version = \">= 6.28, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.28, < 7\"\n+ version = \">= 6.28, < 8\"\n }\n }\n \n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.65, < 7\"\n+ version = \">= 4.65, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.65, < 7\"\n+ version = \">= 4.65, < 8\"\n }\n random = {\n source = \"hashicorp/random\"\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.8, < 7\"\n+ version = \">= 5.8, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.8, < 7\"\n+ version = \">= 5.8, < 8\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0, < 7\"\n+ version = \">= 3.0, < 8\"\n }\n }\n \n---\nmodules/routes/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.83, < 7\"\n+ version = \">= 3.83, < 8\"\n }\n }\n \n---\nmodules/subnets-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.19, < 7\"\n+ version = \">= 2.19, < 8\"\n }\n }\n \n---\nmodules/subnets/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.25.0, < 7\"\n+ version = \">= 4.25.0, < 8\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62, < 7\"\n+ version = \">= 3.62, < 8\"\n }\n }\n \n---\nmodules/vpc/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.19, < 7\"\n+ version = \">= 6.19, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.19, < 7\"\n+ version = \">= 6.19, < 8\"\n }\n }\n \n---\nversions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 7\"\n+ version = \">= 4.64, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 7\"\n+ version = \">= 4.64, < 8\"\n }\n }\n \n---\n\n\n---\n\nChoice B:\nexamples/packet_mirroring/outputs.tf\n@@ -26,6 +26,6 @@ output \"collector_ilb\" {\n }\n \n output \"instance\" {\n- value = google_compute_packet_mirroring.default.mirrored_resources[0].instances[0].url\n+ value = google_compute_instance.mirror.id\n description = \"The VM instance\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 7\"\n+ version = \">= 2.12, < 8\"\n }\n }\n \n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 7\"\n+ version = \">= 2.12, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.12, < 7\"\n+ version = \">= 2.12, < 8\"\n }\n }\n \n---\nmodules/firewall-rules/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.33, < 7\"\n+ version = \">= 3.33, < 8\"\n }\n }\n \n---\nmodules/hierarchical-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.18, < 7\"\n+ version = \">= 6.18, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.18, < 7\"\n+ version = \">= 6.18, < 8\"\n }\n }\n \n---\nmodules/network-connectivity-center/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.2, < 7\"\n+ version = \">= 6.2, < 8\"\n \n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.28, < 7\"\n+ version = \">= 6.28, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.28, < 7\"\n+ version = \">= 6.28, < 8\"\n }\n }\n \n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.65, < 7\"\n+ version = \">= 4.65, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.65, < 7\"\n+ version = \">= 4.65, < 8\"\n }\n random = {\n source = \"hashicorp/random\"\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.8, < 7\"\n+ version = \">= 5.8, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.8, < 7\"\n+ version = \">= 5.8, < 8\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0, < 7\"\n+ version = \">= 3.0, < 8\"\n }\n }\n \n---\nmodules/routes/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.83, < 7\"\n+ version = \">= 3.83, < 8\"\n }\n }\n \n---\nmodules/subnets-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.19, < 7\"\n+ version = \">= 2.19, < 8\"\n }\n }\n \n---\nmodules/subnets/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.25.0, < 7\"\n+ version = \">= 4.25.0, < 8\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62, < 7\"\n+ version = \">= 3.62, < 8\"\n }\n }\n \n---\nmodules/vpc/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.19, < 7\"\n+ version = \">= 6.19, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.19, < 7\"\n+ version = \">= 6.19, < 8\"\n }\n }\n \n---\nversions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 7\"\n+ version = \">= 4.64, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 7\"\n+ version = \">= 4.64, < 8\"\n }\n }\n \n---\n\n\n---\n\nChoice C:\nexamples/packet_mirroring/outputs.tf\n@@ -26,6 +26,6 @@ output \"collector_ilb\" {\n }\n \n output \"instance\" {\n- value = google_compute_packet_mirroring.default.mirrored_resources[0].instances[0].url\n+ value = google_compute_instance.mirror.id\n description = \"The VM instance\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 7\"\n+ version = \">= 2.12, < 8\"\n }\n }\n \n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 7\"\n+ version = \">= 2.12, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.12, < 7\"\n+ version = \">= 2.12, < 8\"\n }\n }\n \n---\nmodules/firewall-rules/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.33, < 7\"\n+ version = \">= 3.33, < 8\"\n }\n }\n \n---\nmodules/hierarchical-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = version = \">= 6.18, < 7\"\n+ version = \">= 6.18, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.18, < 7\"\n+ version = \">= 6.18, < 8\"\n }\n }\n \n---\nmodules/network-connectivity-center/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.2, < 7\"\n+ version = \">= 6.2, < 8\"\n \n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.28, < 7\"\n+ version = \">= 6.28, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.28, < 7\"\n+ version = \">= 6.28, < 8\"\n }\n }\n \n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.65, < 7\"\n+ version = \">= 4.65, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.65, < 7\"\n+ version = \">= 4.65, < 8\"\n }\n random = {\n source = \"hashicorp/random\"\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.8, < 7\"\n+ version = \">= 5.8, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.8, < 7\"\n+ version = \">= 5.8, < 8\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0, < 7\"\n+ version = \">= 3.0, < 8\"\n }\n }\n \n---\nmodules/routes/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.83, < 7\"\n+ version = \">= 3.83, < 8\"\n }\n }\n \n---\nmodules/subnets-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.19, < 7\"\n+ version = \">= 2.19, < 8\"\n }\n }\n \n---\nmodules/subnets/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.25.0, < 7\"\n+ version = \">= 4.25.0, < 8\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62, < 7\"\n+ version = \">= 3.62, < 8\"\n }\n }\n \n---\nmodules/vpc/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.19, < 7\"\n+ version = \">= 6.19, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.19, < 7\"\n+ version = \">= 6.19, < 8\"\n }\n }\n \n---\nversions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 7\"\n+ version = \">= 4.64, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 7\"\n+ version = \">= 4.64, < 8\"\n }\n }\n \n---\n\n\n---\n\nChoice D:\nexamples/packet_mirroring/outputs.tf\n@@ -26,6 +26,6 @@ output \"collector_ilb\" {\n }\n \n output \"instance\" {\n- value = google_compute_packet_mirroring.default.mirrored_resources[0].instances[0].url\n+ value = google_compute_instance.mirror.id\n description = \"The VM instance\"\n }\n---\nmodules/fabric-net-firewall/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 7\"\n+ version = \">= 2.12, < 8\"\n }\n }\n \n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 7\"\n+ version = \">= 2.12, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.12, < 7\"\n+ version = \">= 2.12, < 8\"\n }\n }\n \n---\nmodules/firewall-rules/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.33, < 7\"\n+ version = \">= 3.33, < 8\"\n }\n }\n \n---\nmodules/hierarchical-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.18, < 7\"\n+ version = \">= 6.18, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.18, < 7\"\n+ version = \">= 6.18, < 8\"\n }\n }\n \n---\nmodules/network-connectivity-center/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.2, < 7\"\n+ version = \">= 6.2, < 8\"\n \n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.28, < 7\"\n+ version = \">= 6.28, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.28, < 7\"\n+ version = \">= 6.28, < 8\"\n }\n }\n \n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.65, < 7\"\n+ version = \">= 4.65, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.65, < 7\"\n+ version = \">= 4.65, < 8\"\n }\n random = {\n source = \"hashicorp/random\"\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.8, < 7\"\n+ version = \">= 5.8, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.8, < 7\"\n+ version = \">= 5.8, < 8\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0, < 7\"\n+ version = \">= 3.0, < 8\"\n }\n }\n \n---\nmodules/routes/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.83, < 7\"\n+ version = \">= 3.83, < 8\"\n }\n }\n \n---\nmodules/subnets-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.19, < 7\"\n+ version = \">= 2.19, < 8\"\n }\n }\n \n---\nmodules/subnets/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.25.0, < 7\"\n+ version = \">= 4.25.0, < 8\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62, < 7\"\n+ version = \">= 3.62, < 8\"\n }\n }\n \n---\nmodules/vpc/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 6.19, < 7\"\n+ version = \">= 6.19, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 6.19, < 7\"\n+ version = \">= 6.19, < 8\"\n }\n }\n \n---\nversions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 7\"\n+ version = \">= 4.64, < 8\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 7\"\n+ version = \">= 4.64, < 8\"\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:\nBumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.6 to 1.7.9.\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/hashicorp/go-getter/releases\">github.com/hashicorp/go-getter's releases</a>.</em></p>\n<blockquote>\n<h2>v1.7.9</h2>\n<h2>What's Changed</h2>\n<ul>\n<li>Speed up XZ decompression by 5x with bufio wrapper by <a href=\"https://github.com/vsarunas\"><code>@vsarunas</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/520\">hashicorp/go-getter#520</a></li>\n<li>Fix CI Workflow by <a href=\"https://github.com/mohanmanikanta2299\"><code>@mohanmanikanta2299</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/522\">hashicorp/go-getter#522</a></li>\n<li>test: Remove use of "mitchellh/go-testing-interface" for stdlib by <a href=\"https://github.com/jrasell\"><code>@jrasell</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/523\">hashicorp/go-getter#523</a></li>\n<li>fix: url redact of multiple sshkey by <a href=\"https://github.com/dduzgun-security\"><code>@dduzgun-security</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/528\">hashicorp/go-getter#528</a></li>\n<li>Publish arm binaries by <a href=\"https://github.com/sethvargo\"><code>@sethvargo</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/525\">hashicorp/go-getter#525</a></li>\n<li>fix errcheck lint errors and run it as part of pr checks by <a href=\"https://github.com/abhijeetviswa\"><code>@abhijeetviswa</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/530\">hashicorp/go-getter#530</a></li>\n<li>fix additional lint errors and increase linter scope by <a href=\"https://github.com/abhijeetviswa\"><code>@abhijeetviswa</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/531\">hashicorp/go-getter#531</a></li>\n<li>IND-3728 enabling dependabot by <a href=\"https://github.com/KaushikiAnand\"><code>@KaushikiAnand</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/529\">hashicorp/go-getter#529</a></li>\n<li>fix: go-getter subdir paths by <a href=\"https://github.com/dduzgun-security\"><code>@dduzgun-security</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/540\">hashicorp/go-getter#540</a></li>\n</ul>\n<h2>New Contributors</h2>\n<ul>\n<li><a href=\"https://github.com/vsarunas\"><code>@vsarunas</code></a> made their first contribution in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/520\">hashicorp/go-getter#520</a></li>\n<li><a href=\"https://github.com/jrasell\"><code>@jrasell</code></a> made their first contribution in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/523\">hashicorp/go-getter#523</a></li>\n<li><a href=\"https://github.com/sethvargo\"><code>@sethvargo</code></a> made their first contribution in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/525\">hashicorp/go-getter#525</a></li>\n<li><a href=\"https://github.com/abhijeetviswa\"><code>@abhijeetviswa</code></a> made their first contribution in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/530\">hashicorp/go-getter#530</a></li>\n<li><a href=\"https://github.com/KaushikiAnand\"><code>@KaushikiAnand</code></a> made their first contribution in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/529\">hashicorp/go-getter#529</a></li>\n</ul>\n<p><strong>Full Changelog</strong>: <a href=\"https://github.com/hashicorp/go-getter/compare/v1.7.8...v1.7.9\">https://github.com/hashicorp/go-getter/compare/v1.7.8...v1.7.9</a></p>\n<h2>v1.7.8</h2>\n<h2>What's Changed</h2>\n<ul>\n<li>sec: fix s3 and gcs host checks by <a href=\"https://github.com/dduzgun-security\"><code>@dduzgun-security</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/512\">hashicorp/go-getter#512</a></li>\n</ul>\n<p><strong>Full Changelog</strong>: <a href=\"https://github.com/hashicorp/go-getter/compare/v1.7.7...v1.7.8\">https://github.com/hashicorp/go-getter/compare/v1.7.7...v1.7.8</a></p>\n<h2>v1.7.7</h2>\n<h2>What's Changed</h2>\n<ul>\n<li>Clean up git repo on disk when the ref checkout fails by <a href=\"https://github.com/james-warren0\"><code>@james-warren0</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/504\">hashicorp/go-getter#504</a></li>\n<li>[COMPLIANCE] Add Copyright and License Headers by <a href=\"https://github.com/hashicorp-copywrite\"><code>@hashicorp-copywrite</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/409\">hashicorp/go-getter#409</a></li>\n<li>Add CODEOWNERS file in .github/CODEOWNERS by <a href=\"https://github.com/mukeshjc\"><code>@mukeshjc</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/505\">hashicorp/go-getter#505</a></li>\n<li>IND-1804 Bump up dependencies to remediate vulnerabiities by <a href=\"https://github.com/mohanmanikanta2299\"><code>@mohanmanikanta2299</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/513\">hashicorp/go-getter#513</a></li>\n<li>Updating arguments in github release CI by <a href=\"https://github.com/mohanmanikanta2299\"><code>@mohanmanikanta2299</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/514\">hashicorp/go-getter#514</a></li>\n<li>Updating .goreleaser.yml file with valid version by <a href=\"https://github.com/mohanmanikanta2299\"><code>@mohanmanikanta2299</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/515\">hashicorp/go-getter#515</a></li>\n</ul>\n<h2>New Contributors</h2>\n<ul>\n<li><a href=\"https://github.com/james-warren0\"><code>@james-warren0</code></a> made their first contribution in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/504\">hashicorp/go-getter#504</a></li>\n<li><a href=\"https://github.com/mukeshjc\"><code>@mukeshjc</code></a> made their first contribution in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/505\">hashicorp/go-getter#505</a></li>\n<li><a href=\"https://github.com/mohanmanikanta2299\"><code>@mohanmanikanta2299</code></a> made their first contribution in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/513\">hashicorp/go-getter#513</a></li>\n</ul>\n<p><strong>Full Changelog</strong>: <a href=\"https://github.com/hashicorp/go-getter/compare/v1.7.6...v1.7.7\">https://github.com/hashicorp/go-getter/compare/v1.7.6...v1.7.7</a></p>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/e70221100018573cdc74411c95c19b2a372f6728\"><code>e702211</code></a> Merge pull request <a href=\"https://redirect.github.com/hashicorp/go-getter/issues/532\">#532</a> from hashicorp/dependabot/github_actions/actions-8948...</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/df0a14fa67f2921eabff8fbdb51445ac03daeb87\"><code>df0a14f</code></a> [chore] : Bump the actions group with 8 updates</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/87541b2501c00df5eaedea6acc61a2a4a4efa5b7\"><code>87541b2</code></a> fix: go-getter subdir paths (<a href=\"https://redirect.github.com/hashicorp/go-getter/issues/540\">#540</a>)</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/37130302313c9294df898ac96e2565a65369ec68\"><code>3713030</code></a> [Compliance] - PR Template Changes Required</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/af2dd3ca2764281bf6b7468e05028a8b114c63a7\"><code>af2dd3c</code></a> Merge pull request <a href=\"https://redirect.github.com/hashicorp/go-getter/issues/529\">#529</a> from hashicorp/dependabot-intge</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/bf526297fa4cd429fcf31da9e4a6bf6a0b512026\"><code>bf52629</code></a> updating dependabot.yml</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/1f63e10d3b421544473bf52103b41eb423e2c897\"><code>1f63e10</code></a> changelog added, updated dependabot.yaml</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/45af45918c6958be58f87d1576ac4a0b32f7eb4b\"><code>45af459</code></a> fix additional lint errors and increase linter scope</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/c8c6aba0f7ad4e3937ef7cfcb50627520e498252\"><code>c8c6aba</code></a> fix errcheck lint errors and run it as part of pr checks</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/9b76f983e594375fdef9e231822c805c82ec9ed7\"><code>9b76f98</code></a> copywrite header added</li>\n<li>Additional commits viewable in <a href=\"https://github.com/hashicorp/go-getter/compare/v1.7.6...v1.7.9\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/terraform-google-modules/terraform-google-network/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -37,7 +37,7 @@ require (\n \tgithub.com/googleapis/gax-go/v2 v2.12.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.6 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.9 // 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@@ -62,14 +62,14 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.4 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.21.0 // indirect\n+\tgolang.org/x/crypto v0.32.0 // indirect\n \tgolang.org/x/mod v0.21.0 // indirect\n-\tgolang.org/x/net v0.23.0 // indirect\n+\tgolang.org/x/net v0.34.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // \tgoogle.golang.org/api v0.4.0 // indirect\n-\tgolang.org/x/sys v0.18.0 // indirect\n-\tgolang.org/x/text v0.14.0 // indirect\n-\tgolang.org/x/tools v0.13.0 // indirect\n+\tgolang.org/x/sync v0.10.0 // indirect\n+\tgolang.org/x/sys v0.29.0 // indirect\n+\tgolang.org/x/text v0.21.0 // indirect\n+\tgolang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n \tgoogle.golang.org/appengine v1.6.8 // indirect\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -37,7 +37,7 @@ require (\n \tgithub.com/googleapis/gax-go/v2 v2.12.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.6 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.9 // 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@@ -62,14 +62,14 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.4 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.21.0 // indirect\n+\tgolang.org/x/crypto v0.32.0 // indirect\n \tgolang.org/x/mod v0.21.0 // indirect\n-\tgolang.org/x/net v0.23.0 // indirect\n+\tgolang.org/x/net v0.34.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n-\tgolang.org/x/sync v0.4.0 // indirect\n-\tgolang.org/x/sys v0.18.0 // indirect\n-\tgolang.org/x/text v0.14.0 // indirect\n-\tgolang.org/x/tools v0.13.0 // indirect\n+\tgolang.org/x/sync v0.10.0 // indirect\n+\tgolang.org/x/sys v0.29.0 // indirect\n+\tgolang.org/x/text v0.21.0 // indirect\n+\tgolang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n \tgoogle.golang.org/appengine v1.6.8 // indirect\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -37,7 +37,7 @@ require (\n \tgithub.com/googleapis/gax-go/v2 v2.12.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.6 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.9 // 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@@ -62,14 +62,14 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.21.0 // indirect\n+\tgolang.org/x/crypto v0.32.0 // indirect\n \tgolang.org/x/mod v0.21.0 // indirect\n-\tgolang.org/x/net v0.23.0 // indirect\n+\tgolang.org/x/net v0.34.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n-\tgolang.org/x/sync v0.4.0 // indirect\n-\tgolang.org/x/sys v0.18.0 // indirect\n-\tgolang.org/x/text v0.14.0 // indirect\n-\tgolang.org/x/tools v0.13.0 // indirect\n+\tgolang.org/x/sync v0.10.0 // indirect\n+\tgolang.org/x/sys v0.29.0 // indirect\n+\tgolang.org/x/text v0.21.0 // indirect\n+\tgolang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n \tgoogle.golang.org/appengine v1.6.8 // indirect\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ \tgithub.com/zclconf/go-cty +37,7 @@ require (\n \tgithub.com/googleapis/gax-go/v2 v2.12.0 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.6 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.9 // 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@@ -62,14 +62,14 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.4 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.21.0 // indirect\n+\tgolang.org/x/crypto v0.32.0 // indirect\n \tgolang.org/x/mod v0.21.0 // indirect\n-\tgolang.org/x/net v0.23.0 // indirect\n+\tgolang.org/x/net v0.34.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n-\tgolang.org/x/sync v0.4.0 // indirect\n-\tgolang.org/x/sys v0.18.0 // indirect\n-\tgolang.org/x/text v0.14.0 // indirect\n-\tgolang.org/x/tools v0.13.0 // indirect\n+\tgolang.org/x/sync v0.10.0 // indirect\n+\tgolang.org/x/sys v0.29.0 // indirect\n+\tgolang.org/x/text v0.21.0 // indirect\n+\tgolang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n \tgoogle.golang.org/appengine v1.6.8 // indirect\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:\nmodules/vpc/README.md\n@@ -1,6 +1,6 @@\n # Terraform VPC Module\n \n-This submodule is part of the the `terraform-google-network` module. It creates a vpc network and optionally enables it as a Shared VPC host project.\n+This submodule is part of the `terraform-google-network` module. It creates a vpc network and optionally the it as a Shared VPC host project.\n \n It supports creating:\n \n---\n\n\n---\n\nChoice B:\nmodules/vpc/README.md\n@@ -1,6 +1,6 @@\n # Terraform VPC Module\n \n-This submodule is part of the the `terraform-google-network` module. It creates a vpc network and optionally enables it as a Shared VPC host `terraform-google-network` submodule is part of the `terraform-google-network` module. It creates a vpc network and optionally enables it as a Shared VPC host project.\n \n It supports creating:\n \n---\n\n\n---\n\nChoice C:\nmodules/vpc/README.md\n@@ -1,6 +1,6 @@\n # Terraform VPC Module\n \n-This submodule is part of the the `terraform-google-network` module. It creates a vpc network and optionally enables it as a Shared VPC host project.\n+This submodule is part of the `terraform-google-network` module. It creates a vpc network and optionally modules/vpc/README.md\n@@ it as a Shared VPC host project.\n \n It supports creating:\n \n---\n\n\n---\n\nChoice D:\nmodules/vpc/README.md\n@@ -1,6 +1,6 @@\n # Terraform VPC Module\n \n-This submodule is part of the the `terraform-google-network` module. It creates a vpc network and optionally enables it as a Shared VPC host project.\n+This submodule is part of the `terraform-google-network` module. It creates a vpc network and optionally enables it as a Shared VPC host project.\n \n It supports creating:\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:\nfix #225\n\n---\n\nChoice A:\nexamples/submodule_network_peering/README.md\n@@ -1,6 +1,6 @@\n # Simple VPC Network Peering\n \n-This example creates a VPC \n-This peering between two VPCs.\n+This example creates three VPCs: `local-network`, `peer-network-1`, and `peer-network-2`, and sets up VPC peering between `local-network` and both `peer-network-1` and `peer-network-2`.\n \n <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n\nChoice B:\nexamples/submodule_network_peering/README.md\n@@ -1,6 +1,6 @@\n # Simple VPC Network Peering\n \n-This example creates a VPC Network peering between two VPCs.\n+This example creates three VPCs: `local-network`, `peer-network-1`, and `peer-network-2`, and sets up VPC peering between `local-network` and both `peer-network-1` and `peer-network-2`.\n \n <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n\nChoice C:\nexamples/submodule_network_peering/README.md\n@@ -1,6 +1,6 @@\n # Simple VPC Network Peering\n \n-This example creates a VPC Network peering between two VPCs.\n+This example creates three VPCs: `local-network`, `peer-network-1`, and `peer-network-2`, and sets up VPC peering between `local-network` and both `peer-network-1` and `peer-network-2`.\n \n <!-- BEGINNING OF creates DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n\nChoice D:\nexamples/submodule_network_peering/README.md\n@@ -1,6 +1,6 @@\n # Simple VPC Network Peering\n \n-This example creates a VPC Network peering between two VPCs.\n+This example creates three VPCs: `local-network`, `peer-network-1`, and `peer-network-2`, and sets up VPC peering between `local-network` and both `peer-network-1` and `peer-network-2`.\n \n <!-- BEGINNING OF PRE-COMMIT-TERRAFORM VPCs: 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:\nIt is taking long time for GCP APIs to get updated spokeSummary which is causing tests to fail. Removing spoke count from the NCC test.\n\n---\n\nChoice A:\ntest/integration/network_connectivity_center/network_connectivity_center_test.go\n@@ -31,14 +31,11 @@ func TestNetworkConnectivityCenter(t *testing.T) {\n \t\t\t// net.DefaultVerify(assert) Disable due to bug in provider. Reenable it after the bug is fixed\n \t\t\tprojectID := net.GetStringOutput(\"project_id\")\n \t\t\tnccHubName := net.GetStringOutput(\"ncc_hub_name\")\n-\t\t\texpectedNccSpokesCount := 3\n \n \t\t\top := gcloud.Run(t, \"network-connectivity hubs describe \", gcloud.WithCommonArgs([]string{nccHubName, \"--project\", projectID, \"--format\", \"json\"}))\n \t\t\tnccSpokeStateCount := op.Get(\"spokeSummary.spokeStateCounts\").Array()\n \t\t\tassert.Equal(1, len(nccSpokeStateCount), \"should have spokes in one State\")\n \t\t\tassert.Equal(\"ACTIVE\", nccSpokeStateCount[0].Get(\"state\").String(), \"should have only active spokes\")\n-\t\t\tassert.Equal(int64(expectedNccSpokesCount), nccSpokeStateCount[0].Get(\"count\").Int(), \"should have exactly 3 spokes\")\n-\t\t\tassert.Equal(expectedNccSpokesCount, len(op.Get(\"spokeSummary.spokeTypeCounts\").Array()), \"should have 3 different spoke types\")\n \t\t})\n \tnet.Test()\n }\n---\n\n\n---\n\nChoice B:\ntest/integration/network_connectivity_center/network_connectivity_center_test.go\n@@ -31,14 +31,11 @@ func TestNetworkConnectivityCenter(t *testing.T) {\n \t\t\t// net.DefaultVerify(assert) Disable due to bug in provider. Reenable it after the bug is fixed\n \t\t\tprojectID := net.GetStringOutput(\"project_id\")\n \t\t\tnccHubName := net.GetStringOutput(\"ncc_hub_name\")\n-\t\t\texpectedNccSpokesCount := 3\n \n \t\t\top := gcloud.Run(t, \"network-connectivity hubs describe \", gcloud.WithCommonArgs([]string{nccHubName, \"--project\", projectID, \"--format\", \"json\"}))\n \t\t\tnccSpokeStateCount := op.Get(\"spokeSummary.spokeStateCounts\").Array()\n \t\t\tassert.Equal(1, len(nccSpokeStateCount), \"should have spokes in one net.GetStringOutput(\"project_id\")\n \t\t\tassert.Equal(\"ACTIVE\", nccSpokeStateCount[0].Get(\"state\").String(), \"should have only active spokes\")\n-\t\t\tassert.Equal(int64(expectedNccSpokesCount), nccSpokeStateCount[0].Get(\"count\").Int(), \"should have exactly 3 spokes\")\n-\t\t\tassert.Equal(expectedNccSpokesCount, len(op.Get(\"spokeSummary.spokeTypeCounts\").Array()), \"should have 3 different spoke types\")\n \t\t})\n \tnet.Test()\n }\n---\n\n\n---\n\nChoice C:\nspokes\")\n-\t\t\tassert.Equal(int64(expectedNccSpokesCount), -31,14 +31,11 @@ func TestNetworkConnectivityCenter(t *testing.T) {\n \t\t\t// net.DefaultVerify(assert) Disable due to bug in provider. Reenable it after the bug is fixed\n \t\t\tprojectID := net.GetStringOutput(\"project_id\")\n \t\t\tnccHubName := net.GetStringOutput(\"ncc_hub_name\")\n-\t\t\texpectedNccSpokesCount := 3\n \n \t\t\top := gcloud.Run(t, \"network-connectivity hubs describe \", gcloud.WithCommonArgs([]string{nccHubName, \"--project\", projectID, \"--format\", \"json\"}))\n \t\t\tnccSpokeStateCount := op.Get(\"spokeSummary.spokeStateCounts\").Array()\n \t\t\tassert.Equal(1, len(nccSpokeStateCount), \"should have spokes in one State\")\n \t\t\tassert.Equal(\"ACTIVE\", nccSpokeStateCount[0].Get(\"state\").String(), \"should have only active spokes\")\n-\t\t\tassert.Equal(int64(expectedNccSpokesCount), nccSpokeStateCount[0].Get(\"count\").Int(), \"should have exactly 3 spokes\")\n-\t\t\tassert.Equal(expectedNccSpokesCount, len(op.Get(\"spokeSummary.spokeTypeCounts\").Array()), \"should have 3 different spoke types\")\n \t\t})\n \tnet.Test()\n }\n---\n\n\n---\n\nChoice D:\ntest/integration/network_connectivity_center/network_connectivity_center_test.go\n@@ -31,14 +31,11 @@ func TestNetworkConnectivityCenter(t *testing.T) {\n \t\t\t// net.DefaultVerify(assert) Disable due to bug in provider. Reenable it after the bug is fixed\n \t\t\tprojectID := net.GetStringOutput(\"project_id\")\n \t\t\tnccHubName \"should net.GetStringOutput(\"ncc_hub_name\")\n-\t\t\texpectedNccSpokesCount := 3\n \n \t\t\top := gcloud.Run(t, \"network-connectivity hubs describe \", gcloud.WithCommonArgs([]string{nccHubName, \"--project\", projectID, \"--format\", \"json\"}))\n \t\t\tnccSpokeStateCount := op.Get(\"spokeSummary.spokeStateCounts\").Array()\n \t\t\tassert.Equal(1, len(nccSpokeStateCount), \"should have spokes in one State\")\n \t\t\tassert.Equal(\"ACTIVE\", nccSpokeStateCount[0].Get(\"state\").String(), \"should have only active spokes\")\n-\t\t\tassert.Equal(int64(expectedNccSpokesCount), nccSpokeStateCount[0].Get(\"count\").Int(), \"should have exactly 3 spokes\")\n-\t\t\tassert.Equal(expectedNccSpokesCount, len(op.Get(\"spokeSummary.spokeTypeCounts\").Array()), \"should have 3 different spoke types\")\n \t\t})\n \tnet.Test()\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:\nThe use of google-beta was added to accommodate network_profile at the time. It's now GA and the hard-coded beta provider causes the return of URL for nework_profile `https://www.googleapis.com/compute/beta/projects/.......` when the actual URL from the infrastructure is \r\n`networkProfile: https://www.googleapis.com/compute/v1/projects` ( v1 instead of beta)\r\nyou can validate that by running gcloud compute networks describe <network>\n\n---\n\nChoice A:\nmodules/vpc/main.tf\n@@ -18,7 +18,6 @@\n \tVPC configuration\n *****************************************/\n resource \"google_compute_network\" \"network\" {\n- provider = google-beta\n name = var.network_name\n auto_create_subnetworks = var.auto_create_subnetworks\n routing_mode = var.routing_mode\n---\n\n\n---\n\nChoice B:\nmodules/vpc/main.tf\n@@ -18,7 +18,6 @@\n \tVPC configuration\n *****************************************/\n resource \"google_compute_network\" \"network\" {\n- provider = google-beta\n name = var.network_name\n auto_create_subnetworks = var.auto_create_subnetworks\n routing_mode = var.routing_mode\n---\n\n\n---\n\nChoice C:\nmodules/vpc/main.tf\n@@ -18,7 +18,6 @@\n \tVPC configuration\n *****************************************/\n resource \"google_compute_network\" \"network\" {\n- provider = google-beta\n name = var.network_name\n auto_create_subnetworks = var.auto_create_subnetworks\n routing_mode = var.routing_mode\n---\n\n\n---\n\nChoice D:\nmodules/vpc/main.tf\n@@ -18,7 +18,6 @@\n \tVPC configuration\n *****************************************/\n resource \"google_compute_network\" \"network\" {\n- provider = google-beta\n name = var.network_name\n auto_create_subnetworks = var.auto_create_subnetworks\n routing_mode = var.routing_mode\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:\nThe docs say that the default is `STANDARD` but it is `LEGACY`.\r\n\r\nFixup of #616, which changed the default value but missed some of the docs\n\n---\n\nChoice A:\nREADME.md\n@@ -112,7 +112,7 @@ Then perform the following commands on the root folder:\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`. | `string` | `\"LEGACY\"` | no |\n | bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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---\nmodules/vpc/README.md\n@@ -30,7 +30,7 @@ module \"vpc\" {\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`. | `string` | `\"LEGACY\"` | no |\n | bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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---\nmodules/vpc/variables.tf\n@@ -98,7 +98,7 @@ variable \"bgp_always_compare_med\" {\n \n variable \"bgp_best_path_selection_mode\" {\n type = string\n- description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`.\"\n default = \"LEGACY\"\n }\n \n---\nvariables.tf\n@@ -220,7 +220,7 @@ variable \"bgp_always_compare_med\" {\n \n variable \"bgp_best_path_selection_mode\" {\n type = string\n- description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`.\"\n default = \"LEGACY\"\n }\n \n---\n\n\n---\n\nChoice B:\nREADME.md\n@@ -112,7 +112,7 @@ Then perform the following commands on the root folder:\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`. | `string` | `\"LEGACY\"` | no |\n | bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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---\nmodules/vpc/README.md\n@@ -30,7 +30,7 @@ module \"vpc\" {\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if are AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`. | `string` | `\"LEGACY\"` | no |\n | bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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---\nmodules/vpc/variables.tf\n@@ -98,7 +98,7 @@ variable \"bgp_always_compare_med\" {\n \n variable \"bgp_best_path_selection_mode\" {\n type = string\n- description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`.\"\n default = \"LEGACY\"\n }\n \n---\nvariables.tf\n@@ -220,7 +220,7 @@ variable \"bgp_always_compare_med\" {\n \n variable \"bgp_best_path_selection_mode\" {\n type = string\n- description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`.\"\n default = \"LEGACY\"\n }\n \n---\n\n\n---\n\nChoice C:\nREADME.md\n@@ -112,7 +112,7 @@ Then perform the following commands on the root folder:\n |------|-------------|------|---------|:--------:|\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 region in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |\n | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`. | `string` | `\"LEGACY\"` | no |\n | bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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---\nmodules/vpc/README.md\n@@ -30,7 +30,7 @@ module \"vpc\" {\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`. | `string` | `\"LEGACY\"` | no |\n | bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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---\nmodules/vpc/variables.tf\n@@ -98,7 +98,7 @@ variable \"bgp_always_compare_med\" {\n \n variable \"bgp_best_path_selection_mode\" {\n type = string\n- description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`.\"\n default = \"LEGACY\"\n }\n \n---\nvariables.tf\n@@ -220,7 +220,7 @@ variable \"bgp_always_compare_med\" {\n \n variable \"bgp_best_path_selection_mode\" {\n type = string\n- description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`.\"\n default = \"LEGACY\"\n }\n \n---\n\n\n---\n\nChoice D:\nREADME.md\n@@ -112,7 +112,7 @@ Then perform the following commands on the root folder:\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`. | `string` | `\"LEGACY\"` | no |\n | bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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---\nmodules/vpc/README.md\n@@ -30,7 +30,7 @@ module \"vpc\" {\n |------|-------------|------|---------|:--------:|\n | auto\\_create\\_subnetworks | When set to true, the network is created in 'auto subnet mode' of 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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`. | `string` | `\"LEGACY\"` | no |\n | bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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---\nmodules/vpc/variables.tf\n@@ -98,7 +98,7 @@ variable \"bgp_always_compare_med\" {\n \n variable \"bgp_best_path_selection_mode\" {\n type = string\n- description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`.\"\n default = \"LEGACY\"\n }\n \n---\nvariables.tf\n@@ -220,7 +220,7 @@ variable \"bgp_always_compare_med\" {\n \n variable \"bgp_best_path_selection_mode\" {\n type = string\n- description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `LEGACY`.\"\n default = \"LEGACY\"\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:\nfix #615 \n\n---\n\nChoice A:\nREADME.md\n@@ -112,8 +112,8 @@ Then perform the following commands on the root folder:\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n-| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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 | egress\\_rules | List of egress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> disabled = optional(bool, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n---\nmodules/vpc/README.md\n@@ -30,8 +30,8 @@ module \"vpc\" {\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n-| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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` `LEGACY`. no |\n | description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `\"\"` | no |\n | enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n---\nmodules/vpc/variables.tf\n@@ -99,11 +99,11 @@ variable \"bgp_always_compare_med\" {\n variable \"bgp_best_path_selection_mode\" {\n type = string\n description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n- default = \"STANDARD\"\n+ default = \"LEGACY\"\n }\n \n variable \"bgp_inter_region_cost\" {\n type = string\n- description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n- default = \"DEFAULT\"\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`.\"\n+ default = null\n }\n---\nvariables.tf\n@@ -221,11 +221,11 @@ variable \"bgp_always_compare_med\" {\n variable \"bgp_best_path_selection_mode\" {\n type = string\n description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n- default = \"STANDARD\"\n+ default = \"LEGACY\"\n }\n \n variable \"bgp_inter_region_cost\" {\n type = string\n- description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n- default = \"DEFAULT\"\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`.\"\n+ default = null\n }\n---\n\n\n---\n\nChoice B:\nREADME.md\n@@ -112,8 +112,8 @@ Then perform the following commands on the root folder:\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n-| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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 | egress\\_rules | List of egress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> disabled = optional(bool, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> mode. protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n---\nmodules/vpc/README.md\n@@ -30,8 +30,8 @@ module \"vpc\" {\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n-| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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 | enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n---\nmodules/vpc/variables.tf\n@@ -99,11 +99,11 @@ variable \"bgp_always_compare_med\" {\n variable \"bgp_best_path_selection_mode\" {\n type = string\n description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n- default = \"STANDARD\"\n+ default = \"LEGACY\"\n }\n \n variable \"bgp_inter_region_cost\" {\n type = string\n- description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n- default = \"DEFAULT\"\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`.\"\n+ default = null\n }\n---\nvariables.tf\n@@ -221,11 +221,11 @@ variable \"bgp_always_compare_med\" {\n variable \"bgp_best_path_selection_mode\" {\n type = string\n description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n- default = \"STANDARD\"\n+ default = \"LEGACY\"\n }\n \n variable \"bgp_inter_region_cost\" {\n type = string\n- description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n- default = \"DEFAULT\"\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`.\"\n+ default = null\n }\n---\n\n\n---\n\nChoice C:\nREADME.md\n@@ -112,8 +112,8 @@ Then perform the following commands on the root folder:\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n-| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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 | egress\\_rules | List of egress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> disabled = optional(bool, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n---\nmodules/vpc/README.md\n@@ -30,8 +30,8 @@ module \"vpc\" {\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n-| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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 | enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n---\nmodules/vpc/variables.tf\n@@ -99,11 +99,11 @@ variable \"bgp_always_compare_med\" {\n variable \"bgp_best_path_selection_mode\" {\n type = string\n description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n- default = \"STANDARD\"\n+ default = \"LEGACY\"\n }\n \n variable \"bgp_inter_region_cost\" {\n type = string\n- description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n- default = \"DEFAULT\"\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`.\"\n+ default = null\n }\n---\nvariables.tf\n@@ -221,11 +221,11 @@ variable \"bgp_always_compare_med\" {\n variable \"bgp_best_path_selection_mode\" {\n type = string\n description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n- default = \"STANDARD\"\n+ default = \"LEGACY\"\n }\n \n variable \"bgp_inter_region_cost\" {\n type = string\n- description = \"Specifies the BGP inter-region cost mode. Valid values values `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n- default = \"DEFAULT\"\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`.\"\n+ default = null\n }\n---\n\n\n---\n\nChoice D:\nREADME.md\n@@ -112,8 +112,8 @@ Then perform the following commands on the root folder:\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n-| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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 | egress\\_rules | List of egress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> disabled = optional(bool, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n---\nmodules/vpc/README.md\n@@ -30,8 +30,8 @@ module \"vpc\" {\n |------|-------------|------|---------|:--------:|\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 | bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n-| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n-| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"LEGACY\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. | `string` | `null` | 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 | enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n---\nmodules/vpc/variables.tf\n@@ -99,11 +99,11 @@ variable \"bgp_always_compare_med\" {\n variable \"bgp_best_path_selection_mode\" {\n type = string\n description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n- default = \"STANDARD\"\n+ default = \"LEGACY\"\n }\n \n variable \"bgp_inter_region_cost\" {\n type = string\n- description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n- default = \"DEFAULT\"\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`.\"\n+ default = null\n }\n---\nvariables.tf\n@@ -221,11 +221,11 @@ variable \"bgp_always_compare_med\" {\n variable \"bgp_best_path_selection_mode\" {\n type = string\n description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n- default = \"STANDARD\"\n+ default = \"LEGACY\"\n }\n \n variable \"bgp_inter_region_cost\" {\n type = string\n- description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n- default = \"DEFAULT\"\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`.\"\n+ default = null\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:\nGoogle Cloud push new VPC parameters about BGP options and how google manage the routing network.\r\n\r\nThis PR adds support on those three `google_compute_network`'s parameters : \r\n\r\n- bgp_best_path_selection_mode\r\n- bgp_always_compare_med\r\n- bgp_inter_region_cost\r\n\r\nfix #609 \n\n---\n\nChoice A:\nREADME.md\n@@ -111,6 +111,9 Then perform the following commands on the root folder:\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\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+| bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | 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 | egress\\_rules | List of egress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> disabled = optional(bool, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n---\nmain.tf\n@@ -31,6 +31,9 @@ module \"vpc\" {\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n network_profile = var.network_profile\n+ bgp_always_compare_med = var.bgp_always_compare_med\n+ bgp_best_path_selection_mode = var.bgp_best_path_selection_mode\n+ bgp_inter_region_cost = var.bgp_inter_region_cost\n }\n \n /******************************************\n---\nmodules/vpc/README.md\n@@ -29,6 +29,9 @@ module \"vpc\" {\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\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+| bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | 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 | enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n---\nmodules/vpc/main.tf\n@@ -30,6 +30,9 @@ resource \"google_compute_network\" \"network\" {\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n network_profile = var.network_profile\n+ bgp_always_compare_med = var.bgp_always_compare_med\n+ bgp_best_path_selection_mode = var.bgp_best_path_selection_mode\n+ bgp_inter_region_cost = var.bgp_inter_region_cost\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -89,3 +89,21 @@ variable \"network_profile\" {\n * projects/{projectId}/global/networkProfiles/{network_profile_name}\n EOT\n }\n+\n+variable \"bgp_always_compare_med\" {\n+ type = bool\n+ description = \"If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false.\"\n+ default = false\n+}\n+\n+variable \"bgp_best_path_selection_mode\" {\n+ type = string\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ default = \"STANDARD\"\n+}\n+\n+variable \"bgp_inter_region_cost\" {\n+ type = string\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n+ default = \"DEFAULT\"\n+}\n---\nvariables.tf\n@@ -211,3 +211,21 @@ variable \"network_profile\" {\n * projects/{projectId}/global/networkProfiles/{network_profile_name}\n EOT\n }\n+\n+variable \"bgp_always_compare_med\" {\n+ type = bool\n+ description = \"If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false.\"\n+ default = false\n+}\n+\n+variable \"bgp_best_path_selection_mode\" {\n+ type = string\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ default = \"STANDARD\"\n+}\n+\n+variable \"bgp_inter_region_cost\" {\n+ type = string\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n+ default = \"DEFAULT\"\n+}\n---\n\n\n---\n\nChoice B:\nREADME.md\n@@ -111,6 +111,9 @@ Then perform the following commands on the root folder:\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\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+| bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | 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 | egress\\_rules | List of egress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> disabled = optional(bool, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n---\nmain.tf\n@@ -31,6 +31,9 @@ module \"vpc\" {\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n network_profile = var.network_profile\n+ bgp_always_compare_med = var.bgp_always_compare_med\n+ bgp_best_path_selection_mode = var.bgp_best_path_selection_mode\n+ bgp_inter_region_cost = var.bgp_inter_region_cost\n }\n \n /******************************************\n---\nmodules/vpc/README.md\n@@ -29,6 +29,9 @@ module \"vpc\" {\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\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+| bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | 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 | enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n---\nmodules/vpc/main.tf\n@@ -30,6 +30,9 @@ resource \"google_compute_network\" \"network\" {\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n network_profile = var.network_profile\n+ bgp_always_compare_med = var.bgp_always_compare_med\n+ bgp_best_path_selection_mode = var.bgp_best_path_selection_mode\n+ bgp_inter_region_cost = var.bgp_inter_region_cost\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -89,3 +89,21 @@ variable \"network_profile\" {\n * projects/{projectId}/global/networkProfiles/{network_profile_name}\n EOT\n }\n+\n+variable \"bgp_always_compare_med\" {\n+ type = bool\n+ description = \"If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false.\"\n+ default = false\n+}\n+\n+variable \"bgp_best_path_selection_mode\" {\n+ type = string\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ default = \"STANDARD\"\n+}\n+\n+variable \"bgp_inter_region_cost\" {\n+ type = string\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n+ default = \"DEFAULT\"\n+}\n---\nvariables.tf\n@@ -211,3 +211,21 @@ variable \"network_profile\" {\n * projects/{projectId}/global/networkProfiles/{network_profile_name}\n EOT\n }\n+\n+variable \"bgp_always_compare_med\" {\n+ type = bool\n+ description = \"If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false.\"\n+ default = false\n+}\n+\n+variable \"bgp_best_path_selection_mode\" {\n+ type = string\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ default = \"STANDARD\"\n+}\n+\n+variable \"bgp_inter_region_cost\" {\n+ type = string\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n+ default = \"DEFAULT\"\n+}\n---\n\n\n---\n\nChoice C:\nREADME.md\n@@ -111,6 +111,9 @@ Then perform the following commands on the root folder:\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\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+| bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | 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 | egress\\_rules | List of egress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> disabled = optional(bool, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n---\nmain.tf\n@@ -31,6 +31,9 @@ module \"vpc\" {\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n network_profile = var.network_profile\n+ bgp_always_compare_med = var.bgp_always_compare_med\n+ bgp_best_path_selection_mode = var.bgp_best_path_selection_mode\n+ bgp_inter_region_cost = var.bgp_inter_region_cost\n }\n \n /******************************************\n---\nmodules/vpc/README.md\n@@ -29,6 +29,9 @@ module \"vpc\" {\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\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+| bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use README.md\n@@ values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | 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 | enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n---\nmodules/vpc/main.tf\n@@ -30,6 +30,9 @@ resource \"google_compute_network\" \"network\" {\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n network_profile = var.network_profile\n+ bgp_always_compare_med = var.bgp_always_compare_med\n+ bgp_best_path_selection_mode = var.bgp_best_path_selection_mode\n+ bgp_inter_region_cost = var.bgp_inter_region_cost\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -89,3 +89,21 @@ variable \"network_profile\" {\n * projects/{projectId}/global/networkProfiles/{network_profile_name}\n EOT\n }\n+\n+variable \"bgp_always_compare_med\" {\n+ type = bool\n+ description = \"If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false.\"\n+ default = false\n+}\n+\n+variable \"bgp_best_path_selection_mode\" {\n+ type = string\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ default = \"STANDARD\"\n+}\n+\n+variable \"bgp_inter_region_cost\" {\n+ type = string\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n+ default = \"DEFAULT\"\n+}\n---\nvariables.tf\n@@ -211,3 +211,21 @@ variable \"network_profile\" {\n * projects/{projectId}/global/networkProfiles/{network_profile_name}\n EOT\n }\n+\n+variable \"bgp_always_compare_med\" {\n+ type = bool\n+ description = \"If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false.\"\n+ default = false\n+}\n+\n+variable \"bgp_best_path_selection_mode\" {\n+ type = string\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ default = \"STANDARD\"\n+}\n+\n+variable \"bgp_inter_region_cost\" {\n+ type = string\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n+ default = \"DEFAULT\"\n+}\n---\n\n\n---\n\nChoice D:\nREADME.md\n@@ -111,6 +111,9 @@ Then perform the following commands on the root folder:\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\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+| bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | 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 | egress\\_rules | List of egress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> disabled = optional(bool, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n---\nmain.tf\n@@ -31,6 +31,9 @@ module \"vpc\" {\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n network_profile = var.network_profile\n+ bgp_always_compare_med = var.bgp_always_compare_med\n+ bgp_best_path_selection_mode = var.bgp_best_path_selection_mode\n+ bgp_inter_region_cost = var.bgp_inter_region_cost\n }\n \n /******************************************\n---\nmodules/vpc/README.md\n@@ -29,6 +29,9 @@ module \"vpc\" {\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\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+| bgp\\_always\\_compare\\_med | If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false. | `bool` | `false` | no |\n+| bgp\\_best\\_path\\_selection\\_mode | Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`. | `string` | `\"STANDARD\"` | no |\n+| bgp\\_inter\\_region\\_cost | Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`. | `string` | `\"DEFAULT\"` | 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 | enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n---\nmodules/vpc/main.tf\n@@ -30,6 +30,9 @@ resource \"google_compute_network\" \"network\" {\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n network_profile = var.network_profile\n+ bgp_always_compare_med = var.bgp_always_compare_med\n+ bgp_best_path_selection_mode = var.bgp_best_path_selection_mode\n+ bgp_inter_region_cost = var.bgp_inter_region_cost\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -89,3 +89,21 @@ variable \"network_profile\" {\n * projects/{projectId}/global/networkProfiles/{network_profile_name}\n EOT\n }\n+\n+variable \"bgp_always_compare_med\" {\n+ type = bool\n+ description = \"If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false.\"\n+ default = false\n+}\n+\n+variable \"bgp_best_path_selection_mode\" {\n+ type = string\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ default = \"STANDARD\"\n+}\n+\n+variable \"bgp_inter_region_cost\" {\n+ type = string\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n+ default = \"DEFAULT\"\n+}\n---\nvariables.tf\n@@ -211,3 +211,21 @@ variable \"network_profile\" {\n * projects/{projectId}/global/networkProfiles/{network_profile_name}\n EOT\n }\n+\n+variable \"bgp_always_compare_med\" {\n+ type = bool\n+ description = \"If set to true, the Cloud Router will use MED values from the peer even if the AS paths differ. Default is false.\"\n+ default = false\n+}\n+\n+variable \"bgp_best_path_selection_mode\" {\n+ type = string\n+ description = \"Specifies the BGP best path selection mode. Valid values are `STANDARD` or `LEGACY`. Default is `STANDARD`.\"\n+ default = \"STANDARD\"\n+}\n+\n+variable \"bgp_inter_region_cost\" {\n+ type = string\n+ description = \"Specifies the BGP inter-region cost mode. Valid values are `DEFAULT` or `ADD_COST_TO_MED`. Default is `DEFAULT`.\"\n+ default = \"DEFAULT\"\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/submodule_network_peering/README.md\n@@ -1,6 +1,6 @@\n # Simple VPC Network Peering\n \n-This example creates a Network Network peering between two VPCs.\n+This example creates three VPCs: `local-network`, `peer-network-1`, and `peer-network-2`. It sets up VPC peering between `local-network` and both `peer-network-1` and `peer-network-2`.\n \n <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n\nChoice B:\nexamples/submodule_network_peering/README.md\n@@ -1,6 +1,6 @@\n # Simple VPC Network Peering\n \n-This example creates a VPC Network peering between two VPCs.\n+This example creates three VPCs: `local-network`, `peer-network-1`, and `peer-network-2`. It sets up VPC peering between `local-network` and both `peer-network-1` and `peer-network-2`.\n \n <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n\nChoice C:\nexamples/submodule_network_peering/README.md\n@@ -1,6 +1,6 @@\n # Simple VPC Network Peering\n \n-This example creates a VPC Network peering between two VPCs.\n+This example creates three VPCs: `local-network`, `peer-network-1`, and `peer-network-2`. It sets up VPC peering between `local-network` and both `peer-network-1` and `peer-network-2`.\n \n -->\n BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n\nChoice D:\nexamples/submodule_network_peering/README.md\n@@ -1,6 +1,6 @@\n # Simple VPC Network Peering\n \n-This example creates a VPC Network peering between two VPCs.\n+This example creates three VPCs: `local-network`, `peer-network-1`, and `peer-network-2`. It sets up VPC peering between `local-network` and both `peer-network-1` and `peer-network-2`.\n peering <!-- 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:\nfix #225\n\n---\n\nChoice A:\nexamples/submodule_network_peering/README.md\n@@ -1,6 +1,6 @@\n # Simple VPC Network Peering\n \n-This example creates a VPC Network peering between two VPCs.\n+This and creates three VPCs: `local-network`, `peer-network-1`, and `peer-network-2`. It sets up VPC peering between `local-network` and both `peer-network-1` and `peer-network-2`.\n \n <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n\nChoice B:\nexamples/submodule_network_peering/README.md\n@@ -1,6 +1,6 @@\n # Simple VPC Network Peering\n \n-This example creates a VPC Network peering between two VPCs.\n+This example creates three VPCs: `local-network`, `peer-network-1`, and `peer-network-2`. It sets up VPC peering between `local-network` and both `peer-network-1` and `peer-network-2`.\n \n <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n\nChoice C:\nexamples/submodule_network_peering/README.md\n@@ -1,6 +1,6 @@\n # Simple VPC Network Peering\n \n-This example creates a VPC Network peering between two VPCs.\n+This example creates three VPCs: and `peer-network-1`, and `peer-network-2`. It sets up VPC peering between `local-network` and both `peer-network-1` and `peer-network-2`.\n \n <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n ## Inputs\n---\n\n\n---\n\nChoice D:\nexamples/submodule_network_peering/README.md\n@@ -1,6 +1,6 @@\n # Simple VPC Network Peering\n \n-This example creates a VPC Network peering between two VPCs.\n+This example creates three VPCs: `local-network`, `peer-network-1`, and `peer-network-2`. It sets up VPC peering between `local-network` and both `peer-network-1` and `peer-network-2`.\n \n <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS `peer-network-2`. -->\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:\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [terraform-google-modules/vpn/google](https://registry.terraform.io/modules/terraform-google-modules/vpn/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-vpn)) | module | major | `~> 4.0` -> `~> 5.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-vpn (terraform-google-modules/vpn/google)</summary>\n\n### [`v5.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/blob/HEAD/CHANGELOG.md#500-2025-03-05)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/compare/v4.2.0...v5.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TPG>= 6.21:** Add lables to google_compute_ha_vpn_gateway ([#​176](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/issues/176))\n\n##### Features\n\n- add support for HA VPN over interconnect ([#​178](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/issues/178)) ([0d5d7f0](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/commit/0d5d7f0f7f680a3b27189142f30bda6bddd8a6e6))\n- **TPG>= 6.21:** Add lables to google_compute_ha_vpn_gateway ([#​176](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/issues/176)) ([f9d73d9](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/commit/f9d73d90b012b18d8b00827e5da871f1194a7163))\n\n##### Bug Fixes\n\n- Update versions.tf min 1.3 ([#​179](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/issues/179)) ([f38c80e](https://redirect.github.com/terraform-google-modules/terraform-google-vpn/commit/f38c80e7ae226296f0d9032ebee33efe3ea41f20))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yMDcuMSIsInVwZGF0ZWRJblZlciI6IjM5LjIwNy4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nexamples/network_connectivity_center/main.tf\n@@ -122,7 +122,7 @@ module \"vpn_spoke_local_vpc\" {\n \n module \"remote_to_local_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 4.0\"\n+ version = \"~> = \n project_id = var.project_id\n region = var.vpn_region\n@@ -160,7 +160,7 @@ module \"remote_to_local_vpn\" {\n \n module \"local_to_remote_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 4.0\"\n+ version = \"~> 5.0\"\n \n project_id = var.project_id\n region = var.vpn_region\n---\n\n\n---\n\nChoice B:\nexamples/network_connectivity_center/main.tf\n@@ -122,7 +122,7 @@ module \"vpn_spoke_local_vpc\" {\n \n module \"remote_to_local_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 4.0\"\n+ version = \"~> 5.0\"\n \n project_id = var.project_id\n region = var.vpn_region\n@@ -160,7 +160,7 @@ module \"remote_to_local_vpn\" {\n \n module \"local_to_remote_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 4.0\"\n+ version = \"~> 5.0\"\n \n project_id = var.project_id\n region = var.vpn_region\n---\n\n\n---\n\nChoice C:\nexamples/network_connectivity_center/main.tf\n@@ -122,7 +122,7 @@ module \"vpn_spoke_local_vpc\" {\n \n module \"remote_to_local_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 4.0\"\n+ version = \"~> 5.0\"\n \n project_id = var.project_id\n region \n = var.vpn_region\n@@ -160,7 +160,7 @@ module \"remote_to_local_vpn\" {\n \n module \"local_to_remote_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 4.0\"\n+ version = \"~> 5.0\"\n \n project_id = var.project_id\n region = var.vpn_region\n---\n\n\n---\n\nChoice D:\nexamples/network_connectivity_center/main.tf\n@@ -122,7 +122,7 @@ module \"vpn_spoke_local_vpc\" {\n \n module \"remote_to_local_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 4.0\"\n+ version = \"~> 5.0\"\n \n project_id = var.project_id\n region = var.vpn_region\n@@ -160,7 +160,7 @@ module \"remote_to_local_vpn\" {\n \n module \"local_to_remote_vpn\" {\n source = \"terraform-google-modules/vpn/google//modules/vpn_ha\"\n- version = \"~> 4.0\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n region = var.vpn_region\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 contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [terraform-google-modules/project-factory/google](https://registry.terraform.io/modules/terraform-google-modules/project-factory/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory)) | module | major | `~> 17.0` -> `~> 18.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-project-factory (terraform-google-modules/project-factory/google)</summary>\n\n### [`v18.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/blob/HEAD/CHANGELOG.md#1800-2025-01-04)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/compare/v17.1.0...v18.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TF>=1.3:** update provider and metadata ([#​966](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/966))\n\n##### Bug Fixes\n\n- **TF>=1.3:** update provider and metadata ([#​966](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/966)) ([0bab52d](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/0bab52d3fabab9fa5ba7c45e0fd6630a168537bb))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMDcuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEwNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice B:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice C:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice D:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source \"terraform-google-modules/project-factory/google\"\n- version = \"~> 17.0\"\n+ version = \"~> 18.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\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:\nAs per the [latest documentation](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/vpc_access_connector):\r\n\r\n> Only one of max_throughput and max_instances can be specified. The use of max_throughput is discouraged in favor of max_instances. \r\n\r\nIf you are using both, you will get this error: \r\n```\r\n╷\r\n│ Error: Conflicting configuration arguments\r\n│ \r\n│ with module.serverless_connector.google_vpc_access_connector.connector_beta[\"ew4-serverless\"],\r\n│ on .terraform/modules/serverless_connector/modules/vpc-serverless-connector-beta/main.tf line 36, in resource \"google_vpc_access_connector\" \"connector_beta\":\r\n│ 36: max_instances = each.value.max_instances\r\n│ \r\n│ \"max_instances\": conflicts with max_throughput\r\n╵\r\n╷\r\n│ Error: Conflicting configuration arguments\r\n│ \r\n│ with module.serverless_connector.google_vpc_access_connector.connector_beta[\"ew4-serverless\"],\r\n│ on .terraform/modules/serverless_connector/modules/vpc-serverless-connector-beta/main.tf line 37, in resource \"google_vpc_access_connector\" \"connector_beta\":\r\n│ 37: max_throughput = each.value.max_throughput\r\n│ \r\n│ \"max_throughput\": conflicts with max_instances\r\n```\n\n---\n\nChoice A:\nmodules/vpc-serverless-connector-beta/README.md\n@@ -23,7 +23,6 @@ module \"serverless-connector\" {\n machine_type = \"e2-standard-4\"\n min_instances = 2\n max_instances = 3\n- max_throughput = 300\n }]\n }\n ```\n---\n\n\n---\n\nChoice B:\nmodules/vpc-serverless-connector-beta/README.md\n@@ -23,7 +23,6 @@ module \"serverless-connector\" {\n max_throughput machine_type = \"e2-standard-4\"\n min_instances = 2\n max_instances = 3\n- max_throughput = 300\n }]\n }\n ```\n---\n\n\n---\n\nChoice C:\nmodules/vpc-serverless-connector-beta/README.md\n@@ -23,7 +23,6 module \"serverless-connector\" {\n machine_type = \"e2-standard-4\"\n min_instances = 2\n max_instances = 3\n- max_throughput = 300\n }]\n }\n ```\n---\n\n\n---\n\nChoice D:\nmodules/vpc-serverless-connector-beta/README.md\n@@ -23,7 +23,6 @@ module \"serverless-connector\" {\n machine_type = \"e2-standard-4\"\n min_instances = 2\n max_instances = 3\n- max_throughput = 300\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:\nThis PR adds the `network_profile` setting to the `google_compute_network` resource and to the top level module. This change is necessary to enable the RDMA profiles, required for the new GPU machine types on GCP.\r\n\r\nThis is currently untested and will be updated once the `google-beta` provider with these changes has been released (expected 11/25/24).\n\n---\n\nChoice A:\nREADME.md\n@@ -117,6 +117,7 @@ Then perform the following commands on the root folder:\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\\_firewall\\_policy\\_enforcement\\_order | Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`) | `string` | `null` | no |\n | network\\_name | The name of the network being created | `string` | n/a | yes |\n+| network\\_profile | \"A full or partial URL of the network profile to apply to this network.<br>This field can be set only at resource creation time. For example, the<br>following are valid URLs:<br> * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}<br> * projects/{projectId}/global/networkProfiles/{network\\_profile\\_name} | `string` | `null` | no |\n | project\\_id | The ID of the project where this VPC will be created | `string` | n/a | yes |\n | routes | List of routes being created in this VPC | `list(map(string))` | `[]` | no |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n---\ndocs/upgrading_to_v10.0.0.md\n@@ -2,4 +2,4 @@\n \n The v10.0 release contains backwards-incompatible changes.\n \n-This update requires upgrading the minimum provider version of `hashicorp/google` from `3.50` to `5.8` and `hashicorp/google-beta` from `3.50` to `5.8`.\n+This update requires upgrading the minimum provider version of `hashicorp/google` from `3.50` to `5.8` and `hashicorp/google-beta` from `3.50` to `6.13`.\n---\nmain.tf\n@@ -30,6 +30,7 @@ module \"vpc\" {\n enable_ipv6_ula = var.enable_ipv6_ula\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n+ network_profile = var.network_profile\n }\n \n /******************************************\n---\nmodules/vpc/README.md\n@@ -36,6 +36,7 @@ module \"vpc\" {\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\\_firewall\\_policy\\_enforcement\\_order | Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`) | `string` | `null` | no |\n | network\\_name | The name of the network being created | `string` | n/a | yes |\n+| network\\_profile | \"A full or partial URL of the network profile to apply to this network.<br>This field can be set only at resource creation time. For example, the<br>following are valid URLs:<br> * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}<br> * projects/{projectId}/global/networkProfiles/{network\\_profile\\_name} | `string` | `null` | no |\n | project\\_id | The ID of the project where this VPC will be created | `string` | n/a | yes |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n | shared\\_vpc\\_host | Makes this project a Shared VPC host if 'true' (default 'false') | `bool` | `false` | no |\n---\nmodules/vpc/main.tf\n@@ -18,6 +18,7 @@\n \tVPC configuration\n *****************************************/\n resource \"google_compute_network\" \"network\" {\n+ provider = google-beta\n name = var.network_name\n auto_create_subnetworks = var.auto_create_subnetworks\n routing_mode = var.routing_mode\n@@ -28,6 +29,7 @@ resource \"google_compute_network\" \"network\" {\n enable_ula_internal_ipv6 = var.enable_ipv6_ula\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n+ network_profile = var.network_profile\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -77,3 +77,15 @@ variable \"network_firewall_policy_enforcement_order\" {\n default = null\n description = \"Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`)\"\n }\n+\n+variable \"network_profile\" {\n+ type = string\n+ default = null\n+ description = <<-EOT\n+ \"A full or partial URL of the network profile to apply to this network.\n+ This field can be set only at resource creation time. For example, the\n+ following are valid URLs:\n+ * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ * projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ EOT\n+}\n---\nmodules/vpc/versions.tf\n@@ -24,7 +24,7 @@ terraform {\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 7\"\n+ version = \">= 6.13, < 7\"\n }\n }\n \n---\nvariables.tf\n@@ -199,3 +199,15 @@ variable \"network_firewall_policy_enforcement_order\" {\n default = null\n description = \"Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`)\"\n }\n+\n+variable \"network_profile\" {\n+ type = string\n+ default = null\n+ description = <<-EOT\n+ \"A full or partial URL of the network profile to apply to this network.\n+ This field can be set only at resource creation time. For example, the\n+ following are valid URLs:\n+ * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ * projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ EOT\n+}\n---\n\n\n---\n\nChoice B:\nREADME.md\n@@ -117,6 +117,7 @@ Then perform the following commands on the root folder:\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\\_firewall\\_policy\\_enforcement\\_order | Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`) | `string` | `null` | no |\n | network\\_name | The name of the network being created | `string` | n/a | yes |\n+| network\\_profile | \"A full or partial URL of the network profile to apply to this network.<br>This field can be set only at resource creation time. For example, the<br>following are valid URLs:<br> * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}<br> * projects/{projectId}/global/networkProfiles/{network\\_profile\\_name} | `string` | `null` | no |\n | project\\_id | The ID of the project where this VPC will be created | `string` | n/a | yes |\n | routes | List of routes being created in this VPC | `list(map(string))` | `[]` | no |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n---\ndocs/upgrading_to_v10.0.0.md\n@@ -2,4 +2,4 @@\n \n The v10.0 release contains backwards-incompatible changes.\n \n-This update requires upgrading the minimum provider version of `hashicorp/google` from `3.50` to `5.8` and `hashicorp/google-beta` from `3.50` to `5.8`.\n+This update requires upgrading the minimum provider version of `hashicorp/google` from `3.50` to `5.8` and `hashicorp/google-beta` from `3.50` to `6.13`.\n---\nmain.tf\n@@ -30,6 +30,7 @@ module \"vpc\" {\n enable_ipv6_ula = var.enable_ipv6_ula\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n+ network_profile = var.network_profile\n }\n \n /******************************************\n---\nmodules/vpc/README.md\n@@ -36,6 +36,7 @@ module \"vpc\" {\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\\_firewall\\_policy\\_enforcement\\_order | Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`) | `string` | `null` | no |\n | network\\_name | The name of the network being created | `string` | n/a | yes |\n+| network\\_profile | \"A full or partial URL of the network profile to apply to this network.<br>This field can be set only at resource creation time. For example, the<br>following are valid URLs:<br> * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}<br> * projects/{projectId}/global/networkProfiles/{network\\_profile\\_name} | `string` | `null` | no |\n | project\\_id | The ID of the project where this VPC will be created | `string` | n/a | yes |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n | shared\\_vpc\\_host | Makes this project a Shared VPC host if 'true' (default 'false') | `bool` | `false` | no |\n---\nmodules/vpc/main.tf\n@@ -18,6 +18,7 @@\n \tVPC configuration\n *****************************************/\n resource \"google_compute_network\" \"network\" {\n+ provider = google-beta\n name = var.network_name\n auto_create_subnetworks = var.auto_create_subnetworks\n routing_mode = var.routing_mode\n@@ -28,6 +29,7 @@ resource \"google_compute_network\" \"network\" {\n enable_ula_internal_ipv6 = var.enable_ipv6_ula\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n+ network_profile = var.network_profile\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -77,3 +77,15 @@ variable \"network_firewall_policy_enforcement_order\" {\n default = null\n description = \"Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`)\"\n }\n+\n+variable \"network_profile\" {\n+ type = string\n+ default = null\n+ description = <<-EOT\n+ \"A full or partial URL of the network profile to apply to this network.\n+ This field can be set only at resource creation time. For example, the\n+ following are valid URLs:\n+ * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ * projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ EOT\n+}\n---\nmodules/vpc/versions.tf\n@@ -24,7 +24,7 @@ terraform {\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 7\"\n+ version = \">= 6.13, < 7\"\n }\n }\n \n---\nvariables.tf\n@@ -199,3 +199,15 @@ variable \"network_firewall_policy_enforcement_order\" {\n default = null\n description = \"Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`)\"\n }\n+\n+variable \"network_profile\" {\n+ type = string\n+ default = null\n+ description = <<-EOT\n+ \"A full or partial URL of the network profile to apply to this network.\n+ This field can be set only at resource creation time. For example, the\n+ following are valid URLs:\n+ * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ * projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ EOT\n+}\n---\n\n\n---\n\nChoice C:\nREADME.md\n@@ -117,6 +117,7 @@ Then perform the following commands on the root folder:\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\\_firewall\\_policy\\_enforcement\\_order | Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`) | `string` | `null` | no |\n | network\\_name | The name of the network being created | `string` | n/a | yes |\n+| network\\_profile | \"A full or partial URL of the network profile to apply to this network.<br>This field can be set only at resource creation time. For example, the<br>following are valid URLs:<br> * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}<br> * projects/{projectId}/global/networkProfiles/{network\\_profile\\_name} | `string` | `null` | no |\n | project\\_id | The ID of the project where this VPC will be created | `string` | n/a | yes |\n | routes | List of routes being created in this VPC | `list(map(string))` | `[]` | no |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n---\ndocs/upgrading_to_v10.0.0.md\n@@ -2,4 +2,4 @@\n \n The v10.0 release contains backwards-incompatible changes.\n \n-This update requires upgrading the minimum provider version of `hashicorp/google` from `3.50` to `5.8` and `hashicorp/google-beta` from `3.50` to `5.8`.\n+This update requires upgrading the minimum provider version of `hashicorp/google` from `3.50` to `5.8` and `hashicorp/google-beta` from `3.50` to `6.13`.\n---\nmain.tf\n@@ -30,6 +30,7 @@ module \"vpc\" {\n enable_ipv6_ula = var.enable_ipv6_ula\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n+ network_profile = var.network_profile\n }\n \n /******************************************\n---\nmodules/vpc/README.md\n@@ -36,6 +36,7 @@ module \"vpc\" {\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\\_firewall\\_policy\\_enforcement\\_order | Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`) | `string` | `null` | no |\n | network\\_name | The name of the network being created | `string` | n/a | yes |\n+| network\\_profile | \"A full or partial URL of the network profile to apply to this network.<br>This field can be set only at resource creation time. For example, the<br>following are valid URLs:<br> * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}<br> * projects/{projectId}/global/networkProfiles/{network\\_profile\\_name} | `string` | `null` | no |\n | project\\_id | The ID of the project where this VPC will be created | `string` | n/a | yes |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n | shared\\_vpc\\_host | Makes this project a Shared VPC host if 'true' (default 'false') | `bool` | `false` | no |\n---\nmodules/vpc/main.tf\n@@ -18,6 +18,7 @@\n \tVPC configuration\n *****************************************/\n resource \"google_compute_network\" \"network\" {\n+ provider = google-beta\n name = var.network_name\n auto_create_subnetworks = var.auto_create_subnetworks\n routing_mode = var.routing_mode\n@@ -28,6 +29,7 @@ resource \"google_compute_network\" \"network\" {\n enable_ula_internal_ipv6 = var.enable_ipv6_ula\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n+ network_profile = var.network_profile\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -77,3 +77,15 @@ variable \"network_firewall_policy_enforcement_order\" {\n default = null\n description = \"Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`)\"\n }\n+\n+variable \"network_profile\" {\n+ type = string\n+ default = null\n+ description = <<-EOT\n+ \"A full or partial URL of the network profile to apply to this network.\n+ This field can be set only at resource creation time. For example, the\n+ following are valid URLs:\n+ * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ * projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ EOT\n+}\n---\nmodules/vpc/versions.tf\n@@ -24,7 +24,7 @@ terraform {\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 7\"\n+ version = \">= 6.13, < 7\"\n }\n }\n \n---\nvariables.tf\n@@ -199,3 +199,15 @@ variable \"network_firewall_policy_enforcement_order\" {\n default = null\n description = \"Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`)\"\n }\n+\n+variable \"network_profile\" {\n+ type = string\n+ default = null\n+ description = <<-EOT\n+ = \"A full or partial URL of the network profile to apply to this network.\n+ This field can be set only at resource creation time. For example, the\n+ following are valid URLs:\n+ * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ * projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ EOT\n+}\n---\n\n\n---\n\nChoice D:\nREADME.md\n@@ -117,6 +117,7 @@ Then perform the following commands on the root folder:\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 partial values in the range 1300 to 8896, inclusively. | `number` | `0` | no |\n | network\\_firewall\\_policy\\_enforcement\\_order | Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`) | `string` | `null` | no |\n | network\\_name | The name of the network being created | `string` | n/a | yes |\n+| network\\_profile | \"A full or partial URL of the network profile to apply to this network.<br>This field can be set only at resource creation time. For example, the<br>following are valid URLs:<br> * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}<br> * projects/{projectId}/global/networkProfiles/{network\\_profile\\_name} | `string` | `null` | no |\n | project\\_id | The ID of the project where this VPC will be created | `string` | n/a | yes |\n | routes | List of routes being created in this VPC | `list(map(string))` | `[]` | no |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n---\ndocs/upgrading_to_v10.0.0.md\n@@ -2,4 +2,4 @@\n \n The v10.0 release contains backwards-incompatible changes.\n \n-This update requires upgrading the minimum provider version of `hashicorp/google` from `3.50` to `5.8` and `hashicorp/google-beta` from `3.50` to `5.8`.\n+This update requires upgrading the minimum provider version of `hashicorp/google` from `3.50` to `5.8` and `hashicorp/google-beta` from `3.50` to `6.13`.\n---\nmain.tf\n@@ -30,6 +30,7 @@ module \"vpc\" {\n enable_ipv6_ula = var.enable_ipv6_ula\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n+ network_profile = var.network_profile\n }\n \n /******************************************\n---\nmodules/vpc/README.md\n@@ -36,6 +36,7 @@ module \"vpc\" {\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\\_firewall\\_policy\\_enforcement\\_order | Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`) | `string` | `null` | no |\n | network\\_name | The name of the network being created | `string` | n/a | yes |\n+| network\\_profile | \"A full or partial URL of the network profile to apply to this network.<br>This field can be set only at resource creation time. For example, the<br>following are valid URLs:<br> * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}<br> * projects/{projectId}/global/networkProfiles/{network\\_profile\\_name} | `string` | `null` | no |\n | project\\_id | The ID of the project where this VPC will be created | `string` | n/a | yes |\n | routing\\_mode | The network routing mode (default 'GLOBAL') | `string` | `\"GLOBAL\"` | no |\n | shared\\_vpc\\_host | Makes this project a Shared VPC host if 'true' (default 'false') | `bool` | `false` | no |\n---\nmodules/vpc/main.tf\n@@ -18,6 +18,7 @@\n \tVPC configuration\n *****************************************/\n resource \"google_compute_network\" \"network\" {\n+ provider = google-beta\n name = var.network_name\n auto_create_subnetworks = var.auto_create_subnetworks\n routing_mode = var.routing_mode\n@@ -28,6 +29,7 @@ resource \"google_compute_network\" \"network\" {\n enable_ula_internal_ipv6 = var.enable_ipv6_ula\n internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n+ network_profile = var.network_profile\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -77,3 +77,15 @@ variable \"network_firewall_policy_enforcement_order\" {\n default = null\n description = \"Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`)\"\n }\n+\n+variable \"network_profile\" {\n+ type = string\n+ default = null\n+ description = <<-EOT\n+ \"A full or partial URL of the network profile to apply to this network.\n+ This field can be set only at resource creation time. For example, the\n+ following are valid URLs:\n+ * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ * projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ EOT\n+}\n---\nmodules/vpc/versions.tf\n@@ -24,7 +24,7 @@ terraform {\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 7\"\n+ version = \">= 6.13, < 7\"\n }\n }\n \n---\nvariables.tf\n@@ -199,3 +199,15 @@ variable \"network_firewall_policy_enforcement_order\" {\n default = null\n description = \"Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`)\"\n }\n+\n+variable \"network_profile\" {\n+ type = string\n+ default = null\n+ description = <<-EOT\n+ \"A full or partial URL of the network profile to apply to this network.\n+ This field can be set only at resource creation time. For example, the\n+ following are valid URLs:\n+ * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ * projects/{projectId}/global/networkProfiles/{network_profile_name}\n+ EOT\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- Remove artificial depencency for serial Spoke attachment as internal dependency is fixed\r\n- Move VPC Spoke creation to the spoke project\n\n---\n\nChoice A:\nmodules/network-connectivity-center/main.tf\n@@ -40,7 +40,7 @@ resource \"google_network_connectivity_hub\" \"hub\" {\n \n resource \"google_network_connectivity_spoke\" \"vpc_spoke\" {\n for_each = var.vpc_spokes\n- project = var.project_id\n+ project = split(\"/\", each.value.uri)[1]\n name location = each.key\n location = \"global\"\n description = each.value.description\n@@ -78,11 +78,6 @@ resource \"google_network_connectivity_spoke\" \"hybrid_spoke\" {\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n }\n }\n-\n- # TODO: gleichda remove once b/369823133 is fixed\n- depends_on = [\n- google_network_connectivity_spoke.vpc_spoke\n- ]\n }\n \n resource \"google_network_connectivity_spoke\" \"router_appliance_spoke\" {\n@@ -106,9 +101,4 @@ resource \"google_network_connectivity_spoke\" \"router_appliance_spoke\" {\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n \n }\n-\n- # TODO: gleichda remove once b/369823133 is fixed\n- depends_on = [\n- google_network_connectivity_spoke.hybrid_spoke\n- ]\n }\n---\n\n\n---\n\nChoice B:\nmodules/network-connectivity-center/main.tf\n@@ -40,7 +40,7 @@ resource \"google_network_connectivity_hub\" \"hub\" {\n \n resource \"google_network_connectivity_spoke\" \"vpc_spoke\" {\n for_each = var.vpc_spokes\n- project = var.project_id\n+ = split(\"/\", each.value.uri)[1]\n name = each.key\n location = \"global\"\n description = each.value.description\n@@ -78,11 +78,6 @@ resource \"google_network_connectivity_spoke\" \"hybrid_spoke\" {\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n }\n }\n-\n- # TODO: gleichda remove once b/369823133 is fixed\n- depends_on = [\n- google_network_connectivity_spoke.vpc_spoke\n- ]\n }\n \n resource \"google_network_connectivity_spoke\" \"router_appliance_spoke\" {\n@@ -106,9 +101,4 @@ resource \"google_network_connectivity_spoke\" \"router_appliance_spoke\" {\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n \n }\n-\n- # TODO: gleichda remove once b/369823133 is fixed\n- depends_on = [\n- google_network_connectivity_spoke.hybrid_spoke\n- ]\n }\n---\n\n\n---\n\nChoice C:\nmodules/network-connectivity-center/main.tf\n@@ -40,7 +40,7 @@ resource \"google_network_connectivity_hub\" \"hub\" {\n \n resource \"google_network_connectivity_spoke\" \"vpc_spoke\" {\n for_each = var.vpc_spokes\n- project = var.project_id\n+ project = split(\"/\", each.value.uri)[1]\n name = each.key\n location = \"global\"\n description = each.value.description\n@@ -78,11 +78,6 @@ resource \"google_network_connectivity_spoke\" \"hybrid_spoke\" {\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n }\n }\n-\n- # TODO: gleichda remove once b/369823133 is fixed\n- depends_on = [\n- google_network_connectivity_spoke.vpc_spoke\n- ]\n }\n \n resource \"google_network_connectivity_spoke\" \"router_appliance_spoke\" {\n@@ -106,9 +101,4 @@ resource \"google_network_connectivity_spoke\" \"router_appliance_spoke\" {\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n \n }\n-\n- # TODO: gleichda remove once b/369823133 is fixed\n- depends_on = [\n- google_network_connectivity_spoke.hybrid_spoke\n- ]\n }\n---\n\n\n---\n\nChoice D:\nmodules/network-connectivity-center/main.tf\n@@ -40,7 +40,7 @@ resource \"google_network_connectivity_hub\" \"hub\" {\n \n resource \"google_network_connectivity_spoke\" \"vpc_spoke\" {\n for_each project = var.vpc_spokes\n- project = var.project_id\n+ project = split(\"/\", each.value.uri)[1]\n name = each.key\n location = \"global\"\n description = each.value.description\n@@ -78,11 +78,6 @@ resource \"google_network_connectivity_spoke\" \"hybrid_spoke\" {\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n }\n }\n-\n- # TODO: gleichda remove once b/369823133 is fixed\n- depends_on = [\n- google_network_connectivity_spoke.vpc_spoke\n- ]\n }\n \n resource \"google_network_connectivity_spoke\" \"router_appliance_spoke\" {\n@@ -106,9 +101,4 @@ resource \"google_network_connectivity_spoke\" \"router_appliance_spoke\" {\n site_to_site_data_transfer = each.value.site_to_site_data_transfer\n \n }\n-\n- # TODO: gleichda remove once b/369823133 is fixed\n- depends_on = [\n- google_network_connectivity_spoke.hybrid_spoke\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:\nExpose the min_throughput argument of the google_vpc_access_connector.\n\n---\n\nChoice A:\nmodules/vpc-serverless-connector-beta/README.md\n@@ -23,6 +23,7 @@ module \"serverless-connector\" {\n machine_type = \"e2-standard-4\"\n min_instances = max_instances = 3\n+ min_throughput = 200\n max_throughput = 300\n }]\n }\n---\nmodules/vpc-serverless-connector-beta/main.tf\n@@ -34,5 +34,6 @@ resource \"google_vpc_access_connector\" \"connector_beta\" {\n machine_type = each.value.machine_type\n min_instances = each.value.min_instances\n max_instances = each.value.max_instances\n+ min_throughput = each.value.min_throughput\n max_throughput = each.value.max_throughput\n }\n---\n\n\n---\n\nChoice B:\nmodules/vpc-serverless-connector-beta/README.md\n@@ -23,6 +23,7 @@ module \"serverless-connector\" {\n machine_type = \"e2-standard-4\"\n min_instances = 2\n max_instances = 3\n+ min_throughput = 200\n max_throughput = 300\n }]\n }\n---\nmodules/vpc-serverless-connector-beta/main.tf\n@@ -34,5 +34,6 @@ \"google_vpc_access_connector\" \"connector_beta\" {\n machine_type = each.value.machine_type\n min_instances = each.value.min_instances\n max_instances = each.value.max_instances\n+ min_throughput = each.value.min_throughput\n max_throughput = each.value.max_throughput\n }\n---\n\n\n---\n\nChoice C:\nmodules/vpc-serverless-connector-beta/README.md\n@@ -23,6 +23,7 @@ module \"serverless-connector\" {\n machine_type = \"e2-standard-4\"\n min_instances = 2\n max_instances = 3\n+ min_throughput = 200\n max_throughput = 300\n }]\n }\n---\nmodules/vpc-serverless-connector-beta/main.tf\n@@ -34,5 +34,6 @@ resource \"google_vpc_access_connector\" \"connector_beta\" {\n machine_type = each.value.machine_type\n min_instances = each.value.min_instances\n max_instances = each.value.max_instances\n+ min_throughput = each.value.min_throughput\n max_throughput = each.value.max_throughput\n }\n---\n\n\n---\n\nChoice D:\nmodules/vpc-serverless-connector-beta/README.md\n@@ -23,6 +23,7 @@ module \"serverless-connector\" {\n machine_type = \"e2-standard-4\"\n min_instances = 2\n max_instances = 3\n+ min_throughput = 200\n max_throughput = 300\n }]\n }\n---\nmodules/vpc-serverless-connector-beta/main.tf\n@@ -34,5 +34,6 @@ resource \"google_vpc_access_connector\" \"connector_beta\" {\n machine_type = each.value.machine_type\n min_instances = each.value.min_instances\n max_instances = each.value.max_instances\n+ min_throughput = each.value.min_throughput\n max_throughput = each.value.max_throughput\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:\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [terraform-google-modules/project-factory/google](https://registry.terraform.io/modules/terraform-google-modules/project-factory/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory)) | module | major | `~> 15.0` -> `~> 17.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-project-factory (terraform-google-modules/project-factory/google)</summary>\n\n### [`v17.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/blob/HEAD/CHANGELOG.md#1700-2024-09-10)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/compare/v16.0.1...v17.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- deletion_policy PREVENT as default ([#​940](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/940))\n- **TPG>=5.41:** add deletion_policy ([#​938](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/938))\n\n##### Features\n\n- deletion_policy PREVENT as default ([#​940](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/940)) ([1c1e018](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/1c1e018457468776f84311d56c970579f124f66e))\n- **deps:** Update Terraform Google Provider to v6 (major) ([#​933](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/933)) ([392453e](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/392453ec2a8adc0010ab87c64c463d837198b7ef))\n- **TPG>=5.41:** add deletion_policy ([#​938](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/938)) ([b0ed8a5](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/b0ed8a5c84ff92dbb9f78cae575dfda3b8eb5335))\n\n### [`v16.0.1`](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/blob/HEAD/CHANGELOG.md#1601-2024-08-28)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/compare/v16.0.0...v16.0.1)\n\n##### Bug Fixes\n\n- switch svpc access to explicit dep on service enablement ([#​934](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/934)) ([105be42](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/105be421c9a57f2f29adcaa6fd74377d33652d3a))\n\n### [`v16.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/blob/HEAD/CHANGELOG.md#1600-2024-08-14)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/compare/v15.0.1...v16.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TPG>=5.33:** add support for setting cloud armor tier of the project ([#​921](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/921))\n\n##### Features\n\n- **TPG>=5.33:** add support for setting cloud armor tier of the project ([#​921](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/921)) ([895b501](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/895b501edb3f6b21e2ad6b8f9656a4994b501dd3))\n\n##### Bug Fixes\n\n- ignore changes on firebase label ([#​931](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/931)) ([e424a35](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/e424a3531381d71d1ba37300de3e94eca89209ae))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC44MC4wIiwidXBkYXRlZEluVmVyIjoiMzguODAuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-network\"\n random_project_id = source\n\n---\n\nChoice B:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice C:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice D:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ = \"~> 17.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:\nNone\n\n---\n\nChoice A:\nexamples/hierarchical-firewall-policy/README.md\n@@ -10,7 +10,6 @@ This example creates a Service Account and 2 hierarchical firewall policy. First\n | folder1 | The folder\\_id ID 1 to to create firewall policy in | `any` | n/a | yes |\n | folder2 | The folder\\_id ID 2 to attach firewal policy to | `any` | n/a | yes |\n | folder3 | The folder\\_id ID 3 to attach firewal policy to | `any` | n/a | yes |\n-| org\\_id | The org ID attach firewal policy to | `any` | n/a | yes |\n | project\\_id | The project ID to host the network in | `any` | n/a | yes |\n \n ## Outputs\n---\nexamples/hierarchical-firewall-policy/main.tf\n@@ -48,7 +48,6 @@ module \"firewal_policy\" {\n parent_node = \"folders/${var.folder1}\"\n policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n description = \"test ${local.prefix} firewall policy\"\n- target_org = var.org_id\n target_folders = [var.folder2, var.folder3]\n \n rules = [\n---\nexamples/hierarchical-firewall-policy/variables.tf\n@@ -29,7 +29,3 @@ variable \"folder2\" {\n variable \"folder3\" {\n description = \"The folder_id ID 3 to attach firewal policy to\"\n }\n-\n-variable \"org_id\" {\n- description = \"The org ID attach firewal policy to\"\n-}\n---\ntest/integration/network_connectivity_center/network_connectivity_center_test.go\n@@ -28,7 +28,7 @@ func TestNetworkConnectivityCenter(t *testing.T) {\n \tnet := tft.NewTFBlueprintTest(t)\n \tnet.DefineVerify(\n \t\tfunc(assert *assert.Assertions) {\n-\t\t\tnet.DefaultVerify(assert)\n+\t\t\t// net.DefaultVerify(assert) Disable due to bug in provider. Reenable it after the bug is fixed\n \t\t\tprojectID := net.GetStringOutput(\"project_id\")\n \t\t\tnccHubName := net.GetStringOutput(\"ncc_hub_name\")\n \t\t\texpectedNccSpokesCount := 3\n---\ntest/setup/main.tf\n@@ -38,13 +38,14 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n org_id = var.org_id\n folder_id = google_folder.folder2.id\n This billing_account = var.billing_account\n+ deletion_policy = \"DELETE\"\n \n activate_apis = [\n \"cloudresourcemanager.googleapis.com\",\n---\n\n\n---\n\nChoice B:\nexamples/hierarchical-firewall-policy/README.md\n@@ -10,7 +10,6 @@ This example creates a Service Account and 2 hierarchical firewall policy. First\n | folder1 | The folder\\_id ID 1 to to create firewall policy in | `any` | n/a | yes |\n | folder2 | The folder\\_id ID 2 to attach firewal policy to | `any` | n/a | yes |\n | folder3 | The folder\\_id ID 3 to attach firewal policy to | `any` | n/a | yes |\n-| org\\_id | The org ID attach firewal policy to | `any` | n/a | yes |\n | project\\_id | The project ID to host the network in | `any` | n/a | yes |\n \n ## Outputs\n---\nexamples/hierarchical-firewall-policy/main.tf\n@@ -48,7 +48,6 @@ module \"firewal_policy\" {\n parent_node = \"folders/${var.folder1}\"\n policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n description = \"test ${local.prefix} firewall policy\"\n- target_org = var.org_id\n target_folders = [var.folder2, var.folder3]\n \n rules = [\n---\nexamples/hierarchical-firewall-policy/variables.tf\n@@ -29,7 +29,3 @@ variable \"folder2\" {\n variable \"folder3\" {\n description = \"The folder_id ID 3 to attach firewal policy to\"\n }\n-\n-variable \"org_id\" {\n- description = \"The org ID attach firewal policy to\"\n-}\n---\ntest/integration/network_connectivity_center/network_connectivity_center_test.go\n@@ -28,7 +28,7 @@ func TestNetworkConnectivityCenter(t *testing.T) {\n \tnet := tft.NewTFBlueprintTest(t)\n \tnet.DefineVerify(\n \t\tfunc(assert *assert.Assertions) {\n-\t\t\tnet.DefaultVerify(assert)\n+\t\t\t// net.DefaultVerify(assert) Disable due to bug in provider. Reenable it after the bug is fixed\n \t\t\tprojectID := net.GetStringOutput(\"project_id\")\n \t\t\tnccHubName := net.GetStringOutput(\"ncc_hub_name\")\n \t\t\texpectedNccSpokesCount := 3\n---\ntest/setup/main.tf\n@@ -38,13 +38,14 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n org_id = var.org_id\n folder_id = google_folder.folder2.id\n billing_account = var.billing_account\n+ deletion_policy = \"DELETE\"\n \n activate_apis = [\n \"cloudresourcemanager.googleapis.com\",\n---\n\n\n---\n\nChoice C:\nexamples/hierarchical-firewall-policy/README.md\n@@ -10,7 +10,6 @@ This example creates a Service Account and 2 hierarchical firewall policy. First\n | folder1 | The folder\\_id ID 1 to to create firewall policy in | `any` | n/a | yes |\n | folder2 | The folder\\_id ID 2 to attach firewal policy to | `any` | n/a | yes |\n | folder3 | The folder\\_id ID 3 to attach firewal policy to | `any` | n/a | yes |\n-| org\\_id | The org ID attach firewal policy to | `any` | n/a | yes |\n | project\\_id | The project ID to host the network in | `any` | n/a | yes |\n \n ## Outputs\n---\nexamples/hierarchical-firewall-policy/main.tf\n@@ -48,7 +48,6 @@ module \"firewal_policy\" {\n parent_node = \"folders/${var.folder1}\"\n policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n description = \"test ${local.prefix} firewall policy\"\n- target_org = var.org_id\n target_folders = [var.folder2, var.folder3]\n \n rules = [\n---\nexamples/hierarchical-firewall-policy/variables.tf\n@@ -29,7 +29,3 @@ variable \"folder2\" {\n variable \"folder3\" {\n description = \"The folder_id ID 3 to attach firewal policy to\"\n }\n-\n-variable \"org_id\" {\n- description = \"The org ID attach firewal policy to\"\n-}\n---\ntest/integration/network_connectivity_center/network_connectivity_center_test.go\n@@ -28,7 +28,7 @@ func TestNetworkConnectivityCenter(t *testing.T) {\n \tnet := tft.NewTFBlueprintTest(t)\n \tnet.DefineVerify(\n \t\tfunc(assert *assert.Assertions) {\n-\t\t\tnet.DefaultVerify(assert)\n+\t\t\t// net.DefaultVerify(assert) Disable due to bug in provider. Reenable it after the bug is fixed\n \t\t\tprojectID := net.GetStringOutput(\"project_id\")\n \t\t\tnccHubName := net.GetStringOutput(\"ncc_hub_name\")\n \t\t\texpectedNccSpokesCount := 3\n---\ntest/setup/main.tf\n@@ -38,13 +38,14 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n org_id = var.org_id\n folder_id | = google_folder.folder2.id\n billing_account = var.billing_account\n+ deletion_policy = \"DELETE\"\n \n activate_apis = [\n \"cloudresourcemanager.googleapis.com\",\n---\n\n\n---\n\nChoice D:\nexamples/hierarchical-firewall-policy/README.md\n@@ -10,7 +10,6 @@ This example creates a Service Account and 2 hierarchical firewall policy. First\n | folder1 | The folder\\_id ID 1 to to create firewall policy in | `any` | n/a | yes |\n | folder2 | The folder\\_id ID 2 to attach firewal policy to | `any` | n/a | yes |\n | folder3 | The First\n ID 3 to attach firewal policy to | `any` | n/a | yes |\n-| org\\_id | The org ID attach firewal policy to | `any` | n/a | yes |\n | project\\_id | The project ID to host the network in | `any` | n/a | yes |\n \n ## Outputs\n---\nexamples/hierarchical-firewall-policy/main.tf\n@@ -48,7 +48,6 @@ module \"firewal_policy\" {\n parent_node = \"folders/${var.folder1}\"\n policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n description = \"test ${local.prefix} firewall policy\"\n- target_org = var.org_id\n target_folders = [var.folder2, var.folder3]\n \n rules = [\n---\nexamples/hierarchical-firewall-policy/variables.tf\n@@ -29,7 +29,3 @@ variable \"folder2\" {\n variable \"folder3\" {\n description = \"The folder_id ID 3 to attach firewal policy to\"\n }\n-\n-variable \"org_id\" {\n- description = \"The org ID attach firewal policy to\"\n-}\n---\ntest/integration/network_connectivity_center/network_connectivity_center_test.go\n@@ -28,7 +28,7 @@ func TestNetworkConnectivityCenter(t *testing.T) {\n \tnet := tft.NewTFBlueprintTest(t)\n \tnet.DefineVerify(\n \t\tfunc(assert *assert.Assertions) {\n-\t\t\tnet.DefaultVerify(assert)\n+\t\t\t// net.DefaultVerify(assert) Disable due to bug in provider. Reenable it after the bug is fixed\n \t\t\tprojectID := net.GetStringOutput(\"project_id\")\n \t\t\tnccHubName := net.GetStringOutput(\"ncc_hub_name\")\n \t\t\texpectedNccSpokesCount := 3\n---\ntest/setup/main.tf\n@@ -38,13 +38,14 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n org_id = var.org_id\n folder_id = google_folder.folder2.id\n billing_account = var.billing_account\n+ deletion_policy = \"DELETE\"\n \n activate_apis = [\n \"cloudresourcemanager.googleapis.com\",\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 contains the following updates:\n\n| Package | Type | Update | Change | Pending |\n|---|---|---|---|---|\n| [terraform-google-modules/project-factory/google](https://registry.terraform.io/modules/terraform-google-modules/project-factory/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory)) | module | major | `~> 15.0` -> `~> 16.0` | `17.0.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-project-factory (terraform-google-modules/project-factory/google)</summary>\n\n### [`v16.0.1`](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/blob/HEAD/CHANGELOG.md#1601-2024-08-28)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/compare/v16.0.0...v16.0.1)\n\n##### Bug Fixes\n\n- switch svpc access to explicit dep on service enablement ([#​934](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/934)) ([105be42](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/105be421c9a57f2f29adcaa6fd74377d33652d3a))\n\n### [`v16.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/blob/HEAD/CHANGELOG.md#1600-2024-08-14)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/compare/v15.0.1...v16.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TPG>=5.33:** add support for setting cloud armor tier of the project ([#​921](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/921))\n\n##### Features\n\n- **TPG>=5.33:** add support for setting cloud armor tier of the project ([#​921](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/921)) ([895b501](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/895b501edb3f6b21e2ad6b8f9656a4994b501dd3))\n\n##### Bug Fixes\n\n- ignore changes on firebase label ([#​931](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/931)) ([e424a35](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/e424a3531381d71d1ba37300de3e94eca89209ae))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguNzQuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice B:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name source = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice C:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version \"true\"\n---\n \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice D:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ \"google_folder\" version = \"~> 16.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\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:\nAdds the ability to allow specifying the PSC endpoint as global or not. See https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_forwarding_rule#allow_psc_global_access \n\n---\n\nChoice A:\nmodules/private-service-connect/README.md\n@@ -57,6 +57,7 @@ If you have a firewall rule blocking egress traffic, you will need to configure\n | private\\_service\\_connect\\_ip | The internal IP to be used for the private service connect. | `string` | n/a | yes |\n | private\\_service\\_connect\\_name | Private Service Connect endpoint name. Defaults to `global-psconnect-ip` | `string` | `\"global-psconnect-ip\"` | no |\n | project\\_id | Project ID for Private Service Connect. | `string` | n/a | yes |\n+| psc\\_global\\_access | This is used in PSC consumer ForwardingRule to control whether the PSC endpoint can be accessed from another region. Defaults to `false` | `bool` | `false` | no |\n | service\\_directory\\_namespace | Service Directory namespace to register the forwarding rule under. | `string` | `null` | no |\n | service\\_directory\\_region | Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined. | `string` | `null` | no |\n \n---\nmodules/private-service-connect/main.tf\n@@ -31,13 +31,14 @@ resource \"google_compute_global_address\" \"private_service_connect\" {\n }\n \n resource \"google_compute_global_forwarding_rule\" \"forwarding_rule_private_service_connect\" {\n- provider = google-beta\n- project = var.project_id\n- name = var.forwarding_rule_name\n- target = var.forwarding_rule_target\n- network = var.network_self_link\n- ip_address = google_compute_global_address.private_service_connect.id\n- load_balancing_scheme = \"\"\n+ provider | = google-beta\n+ project = var.project_id\n+ name = var.forwarding_rule_name\n+ target = var.forwarding_rule_target\n+ network = var.network_self_link\n+ ip_address = google_compute_global_address.private_service_connect.id\n+ load_balancing_scheme = \"\"\n+ allow_psc_global_access = var.psc_global_access\n \n dynamic \"service_directory_registrations\" {\n for_each = var.service_directory_namespace != null || var.service_directory_region != null ? [1] : []\n---\nmodules/private-service-connect/variables.tf\n@@ -68,3 +68,9 @@ variable \"service_directory_region\" {\n type = string\n default = null\n }\n+\n+variable \"psc_global_access\" {\n+ description = \"This is used in PSC consumer ForwardingRule to control whether the PSC endpoint can be accessed from another region. Defaults to `false`\"\n+ type = bool\n+ default = false\n+}\n---\n\n\n---\n\nChoice B:\nmodules/private-service-connect/README.md\n@@ -57,6 +57,7 @@ If you have a firewall rule blocking egress traffic, you will need to configure\n | private\\_service\\_connect\\_ip | The internal IP to be used for the private service connect. | `string` | n/a | yes |\n | private\\_service\\_connect\\_name | Private Service Connect endpoint name. Defaults to `global-psconnect-ip` | `string` | `\"global-psconnect-ip\"` | no |\n | project\\_id | Project ID for Private Service Connect. | `string` | n/a | yes |\n+| psc\\_global\\_access | This is used in PSC consumer ForwardingRule to control whether the PSC endpoint can be accessed from another region. Defaults to `false` | `bool` | `false` | no |\n | service\\_directory\\_namespace | Service Directory namespace to register the forwarding rule under. | `string` | `null` | no |\n | service\\_directory\\_region | Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined. | `string` | `null` | no |\n \n---\nmodules/private-service-connect/main.tf\n@@ -31,13 +31,14 @@ resource \"google_compute_global_address\" \"private_service_connect\" {\n }\n \n resource \"google_compute_global_forwarding_rule\" \"forwarding_rule_private_service_connect\" {\n- provider = google-beta\n- project = var.project_id\n- name = var.forwarding_rule_name\n- target = var.forwarding_rule_target\n- network = var.network_self_link\n- ip_address = google_compute_global_address.private_service_connect.id\n- load_balancing_scheme = \"\"\n+ provider = google-beta\n+ project = var.project_id\n+ name = var.forwarding_rule_name\n+ target = var.forwarding_rule_target\n+ network = var.network_self_link\n+ ip_address = google_compute_global_address.private_service_connect.id\n+ load_balancing_scheme = \"\"\n+ allow_psc_global_access = var.psc_global_access\n \n dynamic \"service_directory_registrations\" {\n for_each = var.service_directory_namespace != null || var.service_directory_region != null ? [1] : []\n---\nmodules/private-service-connect/variables.tf\n@@ -68,3 +68,9 @@ variable \"service_directory_region\" {\n type = string\n default = null\n }\n+\n+variable \"psc_global_access\" {\n+ description = \"This is used in PSC consumer ForwardingRule to control whether the PSC endpoint can be accessed from another region. Defaults to `false`\"\n+ type = bool\n+ default = false\n+}\n---\n\n\n---\n\nChoice C:\nmodules/private-service-connect/README.md\n@@ -57,6 +57,7 @@ If you have a firewall rule blocking egress traffic, you will need to configure\n | private\\_service\\_connect\\_ip | The internal IP to be used for the private service connect. | `string` | n/a | yes |\n | private\\_service\\_connect\\_name | Private Service Connect endpoint name. Defaults to `global-psconnect-ip` | `string` | `\"global-psconnect-ip\"` | no |\n | project\\_id | Project ID for Private Service Connect. | `string` | n/a | yes |\n+| psc\\_global\\_access | This is used in PSC consumer ForwardingRule to control whether the PSC endpoint can be accessed from another region. Defaults to `false` | `bool` | for | no |\n | service\\_directory\\_namespace | Service Directory namespace to register the forwarding rule under. | `string` | `null` | no |\n | service\\_directory\\_region | Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined. | `string` | `null` | no |\n \n---\nmodules/private-service-connect/main.tf\n@@ -31,13 +31,14 @@ resource \"google_compute_global_address\" \"private_service_connect\" {\n }\n \n resource \"google_compute_global_forwarding_rule\" \"forwarding_rule_private_service_connect\" {\n- provider = google-beta\n- project = var.project_id\n- name = var.forwarding_rule_name\n- target = var.forwarding_rule_target\n- network = var.network_self_link\n- ip_address = google_compute_global_address.private_service_connect.id\n- load_balancing_scheme = \"\"\n+ provider = google-beta\n+ project = var.project_id\n+ name = var.forwarding_rule_name\n+ target = var.forwarding_rule_target\n+ network = var.network_self_link\n+ ip_address = google_compute_global_address.private_service_connect.id\n+ load_balancing_scheme = \"\"\n+ allow_psc_global_access = var.psc_global_access\n \n dynamic \"service_directory_registrations\" {\n for_each = var.service_directory_namespace != null || var.service_directory_region != null ? [1] : []\n---\nmodules/private-service-connect/variables.tf\n@@ -68,3 +68,9 @@ variable \"service_directory_region\" {\n type = string\n default = null\n }\n+\n+variable \"psc_global_access\" {\n+ description = \"This is used in PSC consumer ForwardingRule to control whether the PSC endpoint can be accessed from another region. Defaults to `false`\"\n+ type = bool\n+ default = false\n+}\n---\n\n\n---\n\nChoice D:\nmodules/private-service-connect/README.md\n@@ -57,6 +57,7 @@ If you have a firewall rule blocking egress traffic, you will need to configure\n | private\\_service\\_connect\\_ip | The internal IP to be used for the private service connect. | `string` | n/a | yes |\n | private\\_service\\_connect\\_name | Private Service Connect endpoint name. Defaults to `global-psconnect-ip` | `string` | `\"global-psconnect-ip\"` | no |\n | project\\_id | Project ID for Private Service Connect. | `string` | n/a | yes |\n+| psc\\_global\\_access | This is used in PSC consumer ForwardingRule to control whether the PSC endpoint can be accessed from another region. Defaults to `false` | `bool` | `false` | no |\n | service\\_directory\\_namespace | Service Directory namespace to register the forwarding rule under. | `string` | `null` | no |\n | service\\_directory\\_region | Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined. | `string` | `null` | no |\n \n---\nmodules/private-service-connect/main.tf\n@@ -31,13 +31,14 @@ resource \"google_compute_global_address\" \"private_service_connect\" {\n }\n \n resource \"google_compute_global_forwarding_rule\" \"forwarding_rule_private_service_connect\" {\n- provider = google-beta\n- project = var.project_id\n- name = var.forwarding_rule_name\n- target = var.forwarding_rule_target\n- network = var.network_self_link\n- ip_address = google_compute_global_address.private_service_connect.id\n- load_balancing_scheme = \"\"\n+ provider = google-beta\n+ project = var.project_id\n+ name = var.forwarding_rule_name\n+ target = var.forwarding_rule_target\n+ network = var.network_self_link\n+ ip_address = google_compute_global_address.private_service_connect.id\n+ load_balancing_scheme Connect \"\"\n+ allow_psc_global_access = var.psc_global_access\n \n dynamic \"service_directory_registrations\" {\n for_each = var.service_directory_namespace != null || var.service_directory_region != null ? [1] : []\n---\nmodules/private-service-connect/variables.tf\n@@ -68,3 +68,9 @@ variable \"service_directory_region\" {\n type = string\n default = null\n }\n+\n+variable \"psc_global_access\" {\n+ description = \"This is used in PSC consumer ForwardingRule to control whether the PSC endpoint can be accessed from another region. Defaults to `false`\"\n+ type = bool\n+ default = false\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 contains the following updates:\n\n| Package | Type | Update | Change | Pending |\n|---|---|---|---|---|\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://togithub.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 4.64, < 6` -> `>= 4.64, < 7` | `6.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://togithub.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 4.25.0, < 6` -> `>= 4.25.0, < 7` | `6.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://togithub.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 3.83, < 6` -> `>= 3.83, < 7` | `6.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://togithub.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 5.8, < 6` -> `>= 5.8, < 7` | `6.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://togithub.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 4.65, < 6` -> `>= 4.65, < 7` | `6.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://togithub.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 3.33, < 6` -> `>= 3.33, < 7` | `6.0.1` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://togithub.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 2.12, < 6` -> `>= 2.12, < 7` | `6.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://togithub.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 4.64, < 6` -> `>= 4.64, < 7` | `6.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://togithub.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 3.62, < 6` -> `>= 3.62, < 7` | `6.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://togithub.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 2.19, < 6` -> `>= 2.19, < 7` | `6.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://togithub.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 3.0, < 6` -> `>= 3.0, < 7` | `6.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://togithub.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 5.8, < 6` -> `>= 5.8, < 7` | `6.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://togithub.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 4.65, < 6` -> `>= 4.65, < 7` | `6.0.1` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://togithub.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 2.12, < 6` -> `>= 2.12, < 7` | `6.0.1` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>hashicorp/terraform-provider-google (google)</summary>\n\n### [`v6.0.0`](https://togithub.com/hashicorp/terraform-provider-google/releases/tag/v6.0.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v5.43.0...v6.0.0)\n\n[Terraform Google Provider 6.0.0 Upgrade Guide](https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/version\\_6\\_upgrade)\n\nBREAKING CHANGES:\n\n- provider: changed provider labels to add the `goog-terraform-provisioned: true` label by default. ([#​19190](https://togithub.com/hashicorp/terraform-provider-google/pull/19190))\n- activedirectory: added `deletion_protection` field to `google_active_directory_domain` resource. This field defaults to `true`, preventing accidental deletions. To delete the resource, you must first set `deletion_protection = false` before destroying the resource. ([#​18906](https://togithub.com/hashicorp/terraform-provider-google/pull/18906))\n- alloydb: removed `network` in `google_alloy_db_cluster`. Use `network_config.network` instead. ([#​19181](https://togithub.com/hashicorp/terraform-provider-google/pull/19181))\n- bigquery: added client-side validation to prevent table view creation if schema contains required fields for `google_bigquery_table` resource ([#​18767](https://togithub.com/hashicorp/terraform-provider-google/pull/18767))\n- bigquery: removed `allow_resource_tags_on_deletion` from `google_bigquery_table`. Resource tags are now always allowed on table deletion. ([#​19077](https://togithub.com/hashicorp/terraform-provider-google/pull/19077))\n- bigqueryreservation: removed `multi_region_auxiliary` from `google_bigquery_reservation` ([#​18922](https://togithub.com/hashicorp/terraform-provider-google/pull/18922))\n- billing: revised the format of `id` for `google_billing_project_info` ([#​18823](https://togithub.com/hashicorp/terraform-provider-google/pull/18823))\n- cloudrunv2: added `deletion_protection` field to `google_cloudrunv2_service`. This field defaults to `true`, preventing accidental deletions. To delete the resource, you must first set `deletion_protection = false` before destroying the resource.([#​19019](https://togithub.com/hashicorp/terraform-provider-google/pull/19019))\n- cloudrunv2: changed `liveness_probe` to no longer infer a default value from api on `google_cloud_run_v2_service`. Removing this field and applying the change will now remove liveness probe from the Cloud Run service. ([#​18764](https://togithub.com/hashicorp/terraform-provider-google/pull/18764))\n- cloudrunv2: retyped `containers.env` to SET from ARRAY for `google_cloud_run_v2_service` and `google_cloud_run_v2_job`. ([#​18855](https://togithub.com/hashicorp/terraform-provider-google/pull/18855))\n- composer: `ip_allocation_policy = []` in `google_composer_environment` is no longer valid configuration. Removing the field from configuration should not produce a diff. ([#​19207](https://togithub.com/hashicorp/terraform-provider-google/pull/19207))\n- compute: added new required field `enabled` in `google_compute_backend_service` and `google_compute_region_backend_service` ([#​18772](https://togithub.com/hashicorp/terraform-provider-google/pull/18772))\n- compute: changed `certifcate_id` in `google_compute_managed_ssl_certificate` to correctly be output only. ([#​19069](https://togithub.com/hashicorp/terraform-provider-google/pull/19069))\n- compute: revised and in some cases removed default values of `connection_draining_timeout_sec`, `balancing_mode` and `outlier_detection` in `google_compute_region_backend_service` and `google_compute_backend_service`. ([#​18720](https://togithub.com/hashicorp/terraform-provider-google/pull/18720))\n- compute: revised the format of `id` for `compute_network_endpoints` ([#​18844](https://togithub.com/hashicorp/terraform-provider-google/pull/18844))\n- compute: `guest_accelerator = []` is no longer valid configuration in `google_compute_instance`. To explicitly set an empty list of objects, set guest_accelerator.count = 0. ([#​19207](https://togithub.com/hashicorp/terraform-provider-google/pull/19207))\n- compute: `google_compute_instance_from_template` and `google_compute_instance_from_machine_image` `network_interface.alias_ip_range, network_interface.access_config, attached_disk, guest_accelerator, service_account, scratch_disk` can no longer be set to an empty block `[]`. Removing the fields from configuration should not produce a diff. ([#​19207](https://togithub.com/hashicorp/terraform-provider-google/pull/19207))\n- compute: `secondary_ip_ranges = []` in `google_compute_subnetwork` is no longer valid configuration. To set an explicitly empty list, use `send_secondary_ip_range_if_empty` and completely remove `secondary_ip_range` from config. ([#​19207](https://togithub.com/hashicorp/terraform-provider-google/pull/19207))\n- container: made `advanced_datapath_observability_config.enable_relay` required in `google_container_cluster` ([#​19060](https://togithub.com/hashicorp/terraform-provider-google/pull/19060))\n- container: removed deprecated field `advanced_datapath_observability_config.relay_mode` from `google_container_cluster` resource. Users are expected to use `enable_relay` field instead. ([#​19060](https://togithub.com/hashicorp/terraform-provider-google/pull/19060))\n- container: three label-related fields are now in `google_container_cluster` resource. `resource_labels` field is non-authoritative and only manages the labels defined by the users on the resource through Terraform. The new output-only `terraform_labels` field merges the labels defined by the users on the resource through Terraform and the default labels configured on the provider. The new output-only `effective_labels` field lists all of labels present on the resource in GCP, including the labels configured through Terraform, the system, and other clients. ([#​19062](https://togithub.com/hashicorp/terraform-provider-google/pull/19062))\n- container: made three fields `resource_labels`, `terraform_labels`, and `effective_labels` be present in `google_container_cluster` datasources. All three fields will have all of labels present on the resource in GCP including the labels configured through Terraform, the system, and other clients, equivalent to `effective_labels` on the resource. ([#​19062](https://togithub.com/hashicorp/terraform-provider-google/pull/19062))\n- container: `guest_accelerator = []` is no longer valid configuration in `google_container_cluster` and `google_container_node_pool`. To explicitly set an empty list of objects, set guest_accelerator.count = 0. ([#​19207](https://togithub.com/hashicorp/terraform-provider-google/pull/19207))\n- container: `guest_accelerator.gpu_driver_installation_config = []` and `guest_accelerator.gpu_sharing_config = []` are no longer valid configuration in `google_container_cluster` and `google_container_node_pool`. Removing the fields from configuration should not produce a diff. ([#​19207](https://togithub.com/hashicorp/terraform-provider-google/pull/19207))\n- datastore: removed `google_datastore_index` in favor of `google_firestore_index` ([#​19160](https://togithub.com/hashicorp/terraform-provider-google/pull/19160))\n- edgenetwork: three label-related fields are now in ` google_edgenetwork_network ` and `google_edgenetwork_subnet` resources. `labels` field is non-authoritative and only manages the labels defined by the users on the resource through Terraform. The new output-only `terraform_labels` field merges the labels defined by the users on the resource through Terraform and the default labels configured on the provider. The new output-only `effective_labels` field lists all of labels present on the resource in GCP, including the labels configured through Terraform, the system, and other clients. ([#​19062](https://togithub.com/hashicorp/terraform-provider-google/pull/19062))\n- identityplatform: removed resource `google_identity_platform_project_default_config` in favor of `google_identity_platform_project_config` ([#​18992](https://togithub.com/hashicorp/terraform-provider-google/pull/18992))\n- pubsub: allowed `schema_settings` in `google_pubsub_topic` to be removed ([#​18631](https://togithub.com/hashicorp/terraform-provider-google/pull/18631))\n- integrations: removed `create_sample_workflows` and `provision_gmek` from `google_integrations_client` ([#​19148](https://togithub.com/hashicorp/terraform-provider-google/pull/19148))\n- redis: added a `deletion_protection_enabled` field to the `google_redis_cluster` resource. This field defaults to `true`, preventing accidental deletions. To delete the resource, you must first set `deletion_protection_enabled = false` before destroying the resource. ([#​19173](https://togithub.com/hashicorp/terraform-provider-google/pull/19173))\n- resourcemanager: added `deletion_protection` field to `google_folder` to make deleting them require an explicit intent. Folder resources now cannot be destroyed unless `deletion_protection = false` is set for the resource. ([#​19021](https://togithub.com/hashicorp/terraform-provider-google/pull/19021))\n- resourcemanager: made `deletion_policy` in `google_project` 'PREVENT' by default. This makes deleting them require an explicit intent. `google_project` resources cannot be destroyed unless `deletion_policy` is set to 'ABANDON' or 'DELETE' for the resource. ([#​19114](https://togithub.com/hashicorp/terraform-provider-google/pull/19114))\n- sql: removed `settings.ip_configuration.require_ssl` in `google_sql_database_instance`. Please use `settings.ip_configuration.ssl_mode` instead. ([#​18843](https://togithub.com/hashicorp/terraform-provider-google/pull/18843))\n- storage: removed `no_age` field from `lifecycle_rule.condition` in the `google_storage_bucket` resource ([#​19048](https://togithub.com/hashicorp/terraform-provider-google/pull/19048))\n- vpcaccess: removed default values for `min_throughput` and `min_instances` fields on `google_vpc_access_connector` and made them default to values returned from the API when not provided by users ([#​18697](https://togithub.com/hashicorp/terraform-provider-google/pull/18697))\n- vpcaccess: added a conflicting fields restriction between `min_throughput` and `min_instances` fields on `google_vpc_access_connector` ([#​18697](https://togithub.com/hashicorp/terraform-provider-google/pull/18697))\n- vpcaccess: added a conflicting fields restriction between `max_throughput` and `max_instances` fields on `google_vpc_access_connector` ([#​18697](https://togithub.com/hashicorp/terraform-provider-google/pull/18697))\n- workstation: defaulted `host.gce_instance.disable_ssh` to true for `google_workstations_workstation_config` ([#​19101](https://togithub.com/hashicorp/terraform-provider-google/pull/19101))\n\nIMPROVEMENTS:\n\n- compute: added fields `reserved_internal_range` and `secondary_ip_ranges[].reserved_internal_range` to `google_compute_subnetwork` resource ([#​19151](https://togithub.com/hashicorp/terraform-provider-google/pull/19151))\n- compute: changed the behavior of `name_prefix` in multiple Compute resources to allow for a longer max length of 54 characters. See the upgrade guide and resource documentation for more details. ([#​19152](https://togithub.com/hashicorp/terraform-provider-google/pull/19152))\n\nBUG FIXES:\n\n- compute: fixed an issue regarding sending `enabled` field by default for null `iap` message in `google_compute_backend_service` and `google_compute_region_backend_service` ([#​18772](https://togithub.com/hashicorp/terraform-provider-google/pull/18772))\n\n</details>\n\n<details>\n<summary>hashicorp/terraform-provider-google-beta (google-beta)</summary>\n\n### [`v6.0.0`](https://togithub.com/hashicorp/terraform-provider-google-beta/releases/tag/v6.0.0)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google-beta/compare/v5.43.0...v6.0.0)\n\n[Terraform Google Provider 6.0.0 Upgrade Guide](https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/version\\_6\\_upgrade)\n\nBREAKING CHANGES:\n\n- provider: changed provider labels to add the `goog-terraform-provisioned: true` label by default. ([#​8004](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/8004))\n- activedirectory: added `deletion_protection` field to `google_active_directory_domain` resource. This field defaults to `true`, preventing accidental deletions. To delete the resource, you must first set `deletion_protection = false` before destroying the resource. ([#​7837](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7837))\n- alloydb: removed `network` in `google_alloy_db_cluster`. Use `network_config.network` instead. ([#​7999](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7999))\n- billing: revised the format of `id` for `google_billing_project_info` ([#​7793](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7793))\n- bigquery: added client-side validation to prevent table view creation if schema contains required fields for `google_bigquery_table` resource ([#​7755](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7755))\n- bigquery: removed `allow_resource_tags_on_deletion` from `google_bigquery_table`. Resource tags are now always allowed on table deletion. ([#​7940](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7940))\n- bigqueryreservation: removed `multi_region_auxiliary` from `google_bigquery_reservation` ([#​7844](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7844))\n- cloudrunv2: added `deletion_protection` field to `google_cloudrunv2_service` to make deleting them require an explicit intent. This field defaults to `true`, preventing accidental deletions. To delete the resource, you must first set `deletion_protection = false` before destroying the resource. ([#​7901](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7901))\n- cloudrunv2: changed `liveness_probe` to no longer infer a default value from api on `google_cloud_run_v2_service`. Removing this field and applying the change will now remove liveness probe from the Cloud Run service. ([#​7753](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7753))\n- cloudrunv2: retyped `containers.env` to SET from ARRAY for `google_cloud_run_v2_service` and `google_cloud_run_v2_job`. ([#​7812](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7812))\n- composer: `ip_allocation_policy = []` in `google_composer_environment` is no longer valid configuration. Removing the field from configuration should not produce a diff. ([#​8011](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/8011))\n- compute: added new required field `enabled` in `google_compute_backend_service` and `google_compute_region_backend_service` ([#​7758](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7758))\n- compute: revised and in some cases removed default values of `connection_draining_timeout_sec`, `balancing_mode` and `outlier_detection` in `google_compute_region_backend_service` and `google_compute_backend_service`. ([#​7723](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7723))\n- compute: updated resource id for `compute_network_endpoints` ([#​7806](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7806))\n- compute: stopped the `certifcate_id` field in `google_compute_managed_ssl_certificate` resource being incorrectly marked as a user-configurable value when it should just be an output. ([#​7936](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7936))\n- compute: `guest_accelerator = []` is no longer valid configuration in `google_compute_instance`. To explicitly set an empty list of objects, set guest_accelerator.count = 0. ([#​8011](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/8011))\n- compute: `google_compute_instance_from_template` and `google_compute_instance_from_machine_image` `network_interface.alias_ip_range, network_interface.access_config, attached_disk, guest_accelerator, service_account, scratch_disk` can no longer be set to an empty block `[]`. Removing the fields from configuration should not produce a diff. ([#​8011](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/8011))\n- compute: `secondary_ip_ranges = []` in `google_compute_subnetwork` is no longer valid configuration. To set an explicitly empty list, use `send_secondary_ip_range_if_empty` and completely remove `secondary_ip_range` from config. ([#​8011](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/8011))\n- container: made `advanced_datapath_observability_config.enable_relay` required in `google_container_cluster` ([#​7930](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7930))\n- container: removed deprecated field `advanced_datapath_observability_config.relay_mode` from `google_container_cluster` resource. Users are expected to use `enable_relay` field instead. ([#​7930](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7930))\n- container: three label-related fields are now in `google_container_cluster` resource. `resource_labels` field is non-authoritative and only manages the labels defined by the users on the resource through Terraform. The new output-only `terraform_labels` field merges the labels defined by the users on the resource through Terraform and the default labels configured on the provider. The new output-only `effective_labels` field lists all of labels present on the resource in GCP, including the labels configured through Terraform, the system, and other clients. ([#​7932](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7932))\n- container: made three fields `resource_labels`, `terraform_labels`, and `effective_labels` be present in `google_container_cluster` datasources. All three fields will have all of labels present on the resource in GCP including the labels configured through Terraform, the system, and other clients, equivalent to `effective_labels` on the resource. ([#​7932](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7932))\n- container: `guest_accelerator = []` is no longer valid configuration in `google_container_cluster` and `google_container_node_pool`. To explicitly set an empty list of objects, set guest_accelerator.count = 0. ([#​8011](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/8011))\n- container: `guest_accelerator.gpu_driver_installation_config = []` and `guest_accelerator.gpu_sharing_config = []` are no longer valid configuration in `google_container_cluster` and `google_container_node_pool`. Removing the fields from configuration should not produce a diff. ([#​8011](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/8011))\n- datastore: removed `google_datastore_index` in favor of `google_firestore_index` ([#​7987](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7987))\n- edgenetwork: three label-related fields are now in ` google_edgenetwork_network ` and `google_edgenetwork_subnet` resources. `labels` field is non-authoritative and only manages the labels defined by the users on the resource through Terraform. The new output-only `terraform_labels` field merges the labels defined by the users on the resource through Terraform and the default labels configured on the provider. The new output-only `effective_labels` field lists all of labels present on the resource in GCP, including the labels configured through Terraform, the system, and other clients. ([#​7932](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7932))\n- identityplatform: removed resource `google_identity_platform_project_default_config` in favor of `google_identity_platform_project_config` ([#​7880](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7880))\n- integrations: removed `create_sample_workflows` and `provision_gmek` from `google_integrations_client` ([#​7977](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7977))\n- pubsub: allowed `schema_settings` in `google_pubsub_topic` to be removed ([#​7674](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7674))\n- redis: added a `deletion_protection_enabled` field to the `google_redis_cluster` resource. This field defaults to `true`, preventing accidental deletions. To delete the resource, you must first set `deletion_protection_enabled = false` before destroying the resource. ([#​7995](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7995))\n- resourcemanager: added `deletion_protection` field to `google_folder` to make deleting them require an explicit intent. Folder resources now cannot be destroyed unless `deletion_protection = false` is set for the resource. ([#​7903](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7903))\n- resourcemanager: made `deletion_policy` in `google_project` 'PREVENT' by default. This makes deleting them require an explicit intent. `google_project` resources cannot be destroyed unless `deletion_policy` is set to 'ABANDON' or 'DELETE' for the resource. ([#​7946](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7946))\n- storage: removed `no_age` field from `lifecycle_rule.condition` in the `google_storage_bucket` resource ([#​7923](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7923))\n- sql: removed `settings.ip_configuration.require_ssl` in `google_sql_database_instance`. Please use `settings.ip_configuration.ssl_mode` instead. ([#​7804](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7804))\n- vpcaccess: removed default values for `min_throughput` and `min_instances` fields on `google_vpc_access_connector` and made them default to values returned from the API when not provided by users ([#​7709](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7709))\n- vpcaccess: added a conflicting fields restriction between `min_throughput` and `min_instances` fields on `google_vpc_access_connector` ([#​7709](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7709))\n- vpcaccess: added a conflicting fields restriction between `max_throughput` and `max_instances` fields on `google_vpc_access_connector` ([#​7709](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7709))\n- workstation: defaulted `host.gce_instance.disable_ssh` to true for `google_workstations_workstation_config` ([#​7946](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7946))\n\nIMPROVEMENTS:\n\n- compute: added fields `reserved_internal_range` and `secondary_ip_ranges[].reserved_internal_range` to `google_compute_subnetwork` resource ([#​7980](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7980))\n- compute: changed the behavior of `name_prefix` in multiple Compute resources to allow for a longer max length of 54 characters. See the upgrade guide and resource documentation for more details. ([#​7981](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7981))\n\nBUG FIXES:\n\n- compute: fixed an issue regarding sending `enabled` field by default for null `iap` message in `google_compute_backend_service` and `google_compute_region_backend_service` ([#​7758](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/7758))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguNTYuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nmodules/fabric-net-firewall/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 6\"\n+ version = \">= 2.12, < 7\"\n }\n }\n \n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 6\"\n+ version = \">= 2.12, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.12, < 6\"\n+ version = \">= 2.12, < 7\"\n }\n @@ }\n \n---\nmodules/firewall-rules/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.33, < 6\"\n+ version = \">= 3.33, < 7\"\n }\n }\n \n---\nmodules/hierarchical-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\nmodules/network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.65, < 6\"\n+ version = \">= 4.65, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.65, < 6\"\n+ version = \">= 4.65, < 7\"\n }\n random = {\n source = \"hashicorp/random\"\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.8, < 6\"\n+ version = \">= 5.8, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.8, < 6\"\n+ version = \">= 5.8, < 7\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0, < 6\"\n+ version = \">= 3.0, < 7\"\n }\n }\n \n---\nmodules/routes/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.83, < 6\"\n+ version = \">= 3.83, < 7\"\n }\n }\n \n---\nmodules/subnets-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.19, < 6\"\n+ version = \">= 2.19, < 7\"\n }\n }\n \n---\nmodules/subnets/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.25.0, < 6\"\n+ version = \">= 4.25.0, < 7\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62, < 6\"\n+ version = \">= 3.62, < 7\"\n }\n }\n \n---\nmodules/vpc/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\nversions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-firewall/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 6\"\n+ version = \">= 2.12, < 7\"\n }\n }\n \n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 6\"\n+ version = \">= 2.12, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.12, < 6\"\n+ version = \">= 2.12, < 7\"\n }\n }\n \n---\nmodules/firewall-rules/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.33, < 6\"\n+ version = \">= 3.33, < 7\"\n }\n }\n \n---\nmodules/hierarchical-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\nmodules/network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.65, < 6\"\n+ version = \">= 4.65, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.65, < 6\"\n+ version = \">= 4.65, < 7\"\n }\n random = {\n source = \"hashicorp/random\"\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.8, < 6\"\n+ version = \">= 5.8, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.8, < 6\"\n+ version = \">= 5.8, < 7\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0, < 6\"\n+ version = \">= 3.0, < 7\"\n }\n }\n \n---\nmodules/routes/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.83, < 6\"\n+ version = \">= 3.83, < 7\"\n }\n }\n \n---\nmodules/subnets-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.19, < 6\"\n+ version = \">= 2.19, < 7\"\n }\n }\n \n---\nmodules/subnets/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.25.0, < 6\"\n+ version = \">= 4.25.0, < 7\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62, < 6\"\n+ version = \">= 3.62, < 7\"\n }\n }\n \n---\nmodules/vpc/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\nversions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-firewall/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 6\"\n+ version = \">= 2.12, < 7\"\n }\n }\n \n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 6\"\n+ version = \">= 2.12, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.12, < 6\"\n+ version = \">= 2.12, < 7\"\n }\n }\n \n---\nmodules/firewall-rules/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.33, < 6\"\n+ version = \">= 3.33, < 7\"\n }\n }\n \n---\nmodules/hierarchical-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\nmodules/network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.65, < 6\"\n+ version = \">= 4.65, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.65, < 6\"\n+ version = \">= 4.65, < 7\"\n }\n random = {\n source = \"hashicorp/random\"\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.8, < 6\"\n+ version = \">= 5.8, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.8, < 6\"\n+ version = \">= 5.8, < 7\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0, < 6\"\n+ version = \">= 3.0, < 7\"\n }\n }\n \n---\nmodules/routes/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.83, < 6\"\n+ version = \">= 3.83, < 7\"\n }\n }\n \n---\nmodules/subnets-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.19, < 6\"\n+ version = \">= 2.19, < 7\"\n }\n }\n \n---\nmodules/subnets/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.25.0, < 6\"\n+ version = \">= 4.25.0, < 7\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62, < 6\"\n+ version = \">= 3.62, < 7\"\n }\n }\n \n---\nmodules/vpc/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n \">= source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\nversions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-firewall/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 6\"\n+ version = \">= 2.12, < 7\"\n }\n }\n \n---\nmodules/fabric-net-svpc-access/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 2.12, < 6\"\n+ version = \">= 2.12, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.12, < 6\"\n+ version = \">= 2.12, < 7\"\n }\n }\n \n---\nmodules/firewall-rules/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.33, < 6\"\n+ version = \">= 3.33, < 7\"\n }\n }\n \n---\nmodules/hierarchical-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\nmodules/network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.65, < 6\"\n+ version = \">= 4.65, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.65, < 6\"\n+ version = \">= 4.65, < 7\"\n }\n random = {\n source = \"hashicorp/random\"\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.8, < 6\"\n+ version = \">= 5.8, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.8, < 6\"\n+ version = \">= 5.8, < 7\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0, < 6\"\n+ version = \">= 3.0, < 7\"\n }\n }\n \n---\nmodules/routes/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.83, < 6\"\n+ version = \">= 3.83, < 7\"\n }\n }\n \n---\nmodules/subnets-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 2.19, < 6\"\n+ version = \">= 2.19, < 7\"\n }\n }\n \n---\nmodules/subnets/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.25.0, < 6\"\n+ version = \">= 4.25.0, < 7\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62, < 6\"\n+ version = \">= 3.62, < 7\"\n }\n }\n \n---\nmodules/vpc/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n }\n \n---\nversions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 6\"\n+ version = \">= 4.64, < 7\"\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:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [hashicorp/terraform](https://togithub.com/hashicorp/terraform) | required_version | patch | `>= 0.13` -> `1.9.3` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>hashicorp/terraform (hashicorp/terraform)</summary>\n\n### [`v1.9.3`](https://togithub.com/hashicorp/terraform/releases/tag/v1.9.3)\n\n[Compare Source](https://togithub.com/hashicorp/terraform/compare/v1.9.2...v1.9.3)\n\n##### 1.9.3 (July 24, 2024)\n\nENHANCEMENTS:\n\n- Terraform now returns a more specific error message in the awkward situation where an input variable validation rule is known to have failed (`condition` returned `false`) but the error message is derived from an unknown value. ([#​35400](https://togithub.com/hashicorp/terraform/pull/35400))\n\nBUG FIXES:\n\n- core: Terraform no longer performs an unnecessary refresh when removing an instance targeted by a `removed` block. ([#​35458](https://togithub.com/hashicorp/terraform/pull/35458))\n- config generation: Fix validation error when using nested computed or deprecated attributes. ([#​35484](https://togithub.com/hashicorp/terraform/pull/35484))\n- Updated to newer github.com/hashicorp/go-retryablehttp version, addressing CVE-2024-6104, and bringing in updates for several indirect dependencies. ([#​35473](https://togithub.com/hashicorp/terraform/pull/35473))\n- Moved to building with Go 1.22.5, which addresses CVE-2024-24791 and several other non-security bugs. ([#​35494](https://togithub.com/hashicorp/terraform/pull/35494))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4xOC4xNyIsInVwZGF0ZWRJblZlciI6IjM4LjE4LjE3IiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIiwibGFiZWxzIjpbImRlcGVuZGVuY2llcyJdfQ==-->\n\n\n---\n\nChoice A:\nexamples/private_service_connect/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13\"\n+ required_version = \"1.9.3\"\n required_providers {\n google = {\n required_version source = \"hashicorp/google\"\n---\n\n\n---\n\nChoice B:\nexamples/private_service_connect/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13\"\n+ required_version = \"1.9.3\"\n required_providers {\n \"hashicorp/google\"\n---\n google = {\n source = \"hashicorp/google\"\n---\n\n\n---\n\nChoice C:\nexamples/private_service_connect/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n -15,7 {\n- required_version = \">= 0.13\"\n+ required_version = \"1.9.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\n\n\n---\n\nChoice D:\nexamples/private_service_connect/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13\"\n+ required_version = \"1.9.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\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| [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 | `~> 14.0` -> `~> 15.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-project-factory (terraform-google-modules/project-factory/google)</summary>\n\n### [`v15.0.1`](https://togithub.com/terraform-google-modules/terraform-google-project-factory/blob/HEAD/CHANGELOG.md#1501-2024-05-17)\n\n[Compare Source](https://togithub.com/terraform-google-modules/terraform-google-project-factory/compare/v15.0.0...v15.0.1)\n\n##### Bug Fixes\n\n- **core_project_factory:** ignore if SA already exists ([#​910](https://togithub.com/terraform-google-modules/terraform-google-project-factory/issues/910)) ([cfd7f3f](https://togithub.com/terraform-google-modules/terraform-google-project-factory/commit/cfd7f3f15e0866fe09cc5ec4a2f8e94398c773d9))\n\n### [`v15.0.0`](https://togithub.com/terraform-google-modules/terraform-google-project-factory/blob/HEAD/CHANGELOG.md#1500-2024-05-02)\n\n[Compare Source](https://togithub.com/terraform-google-modules/terraform-google-project-factory/compare/v14.5.0...v15.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TPG >5.22:** added vpc sc dry run mode option ([#​894](https://togithub.com/terraform-google-modules/terraform-google-project-factory/issues/894))\n\n##### Features\n\n- **TPG >5.22:** added vpc sc dry run mode option ([#​894](https://togithub.com/terraform-google-modules/terraform-google-project-factory/issues/894)) ([0cade7f](https://togithub.com/terraform-google-modules/terraform-google-project-factory/commit/0cade7f11556b1b0ac1b3567f71f084f07041192))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNTEuMiIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIiwibGFiZWxzIjpbImRlcGVuZGVuY2llcyJdfQ==-->\n\n\n---\n\nChoice A:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 14.0\"\n+ \"project\" = \"~> 15.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice B:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 14.0\"\n+ version = \"~> \n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice C:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version \"project\" \"~> 14.0\"\n+ version = \"~> 15.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\n---\n\n\n---\n\nChoice D:\ntest/setup/main.tf\n@@ -38,7 +38,7 @@ resource \"google_folder\" \"folder3\" {\n \n module \"project\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 14.0\"\n+ version = \"~> 15.0\"\n \n name = \"ci-network\"\n random_project_id = \"true\"\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 | Update | Change |\n|---|---|---|\n| cft/developer-tools | minor | `1.21` -> `1.22` |\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIiwibGFiZWxzIjpbImRlcGVuZGVuY2llcyJdfQ==-->\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 \n---\nbuild/int.cloudbuild.yaml\n@@ \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.21\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -231,4 +231,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.21'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\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.21'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\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.21\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -231,4 +231,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.21'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\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.21'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\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.21\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -231,4 +231,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.21'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\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.21'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: :=\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.21\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -231,4 +231,4 '1.21'\n+ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.21'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\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.21'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\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:\nBumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.2 to 1.7.4.\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/hashicorp/go-getter/releases\">github.com/hashicorp/go-getter's releases</a>.</em></p>\n<blockquote>\n<h2>v1.7.4</h2>\n<h2>What's Changed</h2>\n<ul>\n<li>Escape user-provided strings in <code>git</code> commands <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/483\">hashicorp/go-getter#483</a></li>\n<li>Fixed a bug in <code>.netrc</code> handling if the file does not exist <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/433\">hashicorp/go-getter#433</a></li>\n</ul>\n<p><strong>Full Changelog</strong>: <a href=\"https://github.com/hashicorp/go-getter/compare/v1.7.3...v1.7.4\">https://github.com/hashicorp/go-getter/compare/v1.7.3...v1.7.4</a></p>\n<h2>v1.7.3</h2>\n<h2>What's Changed</h2>\n<ul>\n<li>SEC-090: Automated trusted workflow pinning (2023-04-21) by <a href=\"https://github.com/hashicorp-tsccr\"><code>@hashicorp-tsccr</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/432\">hashicorp/go-getter#432</a></li>\n<li>SEC-090: Automated trusted workflow pinning (2023-09-11) by <a href=\"https://github.com/hashicorp-tsccr\"><code>@hashicorp-tsccr</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/454\">hashicorp/go-getter#454</a></li>\n<li>SEC-090: Automated trusted workflow pinning (2023-09-18) by <a href=\"https://github.com/hashicorp-tsccr\"><code>@hashicorp-tsccr</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/458\">hashicorp/go-getter#458</a></li>\n<li>don't change GIT_SSH_COMMAND when there is no sshKeyFile by <a href=\"https://github.com/jbardin\"><code>@jbardin</code></a> in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/459\">hashicorp/go-getter#459</a></li>\n</ul>\n<h2>New Contributors</h2>\n<ul>\n<li><a href=\"https://github.com/hashicorp-tsccr\"><code>@hashicorp-tsccr</code></a> made their first contribution in <a href=\"https://redirect.github.com/hashicorp/go-getter/pull/432\">hashicorp/go-getter#432</a></li>\n</ul>\n<p><strong>Full Changelog</strong>: <a href=\"https://github.com/hashicorp/go-getter/compare/v1.7.2...v1.7.3\">https://github.com/hashicorp/go-getter/compare/v1.7.2...v1.7.3</a></p>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/268c11cae8cf0d9374783e06572679796abe9ce9\"><code>268c11c</code></a> escape user provide string to git (<a href=\"https://redirect.github.com/hashicorp/go-getter/issues/483\">#483</a>)</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/975961f5f06346ccc282cd0d9aa16e160d26f9e3\"><code>975961f</code></a> Merge pull request <a href=\"https://redirect.github.com/hashicorp/go-getter/issues/433\">#433</a> from adrian-bl/netrc-fix</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/0298a221674f629339295fa8a1e6a938e28506e0\"><code>0298a22</code></a> Merge pull request <a href=\"https://redirect.github.com/hashicorp/go-getter/issues/459\">#459</a> from hashicorp/jbardin/setup-git-env</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/c70d9c915b8e823c44dd591088d15cde70d5e813\"><code>c70d9c9</code></a> don't change GIT_SSH_COMMAND if there's no keyfile</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/3d5770fe3ae127b90f54d825ef1772f0b4e86621\"><code>3d5770f</code></a> Merge pull request <a href=\"https://redirect.github.com/hashicorp/go-getter/issues/458\">#458</a> from hashicorp/tsccr-auto-pinning/trusted/2023-09-18</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/06889794ed3f360b24e8ef7169294ccc59abc044\"><code>0688979</code></a> Result of tsccr-helper -log-level=info -pin-all-workflows .</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/e66f244d9206aca1ce0dee4823c833fecb2f77fc\"><code>e66f244</code></a> Merge pull request <a href=\"https://redirect.github.com/hashicorp/go-getter/issues/454\">#454</a> from hashicorp/tsccr-auto-pinning/trusted/2023-09-11</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/e80b3dc3ab7e46dee8a3fd51e5ac364639d13c6f\"><code>e80b3dc</code></a> Result of tsccr-helper -log-level=info -pin-all-workflows .</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/2d49e243e1903622cc62b9ad900d61df0984c4e1\"><code>2d49e24</code></a> Merge pull request <a href=\"https://redirect.github.com/hashicorp/go-getter/issues/432\">#432</a> from hashicorp/tsccr-auto-pinning/trusted/2023-04-21</li>\n<li><a href=\"https://github.com/hashicorp/go-getter/commit/5ccb39a79407cabe43d0f263e9358614acaa0cda\"><code>5ccb39a</code></a> Make addAuthFromNetrc ignore ENOTDIR errors</li>\n<li>Additional commits viewable in <a href=\"https://github.com/hashicorp/go-getter/compare/v1.7.2...v1.7.4\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/terraform-google-modules/terraform-google-network/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -36,7 +36,7 @@ require (\n \tgithub.com/googleapis/gax-go/v2 v2.12.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.2 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.4 // 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@@ -360,8 +360,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY\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.2 h1:uJDtyXwEfalmp1PqdxuhZqrNkUyClZAhVeZYTArbqkg=\n-github.com/hashicorp/go-getter v1.7.2/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n+github.com/hashicorp/go-getter v1.7.4 h1:3yQjWuxICvSpYwqSayAdKRFcvBl1y/vogCxczWSmix0=\n+github.com/hashicorp/go-getter v1.7.4/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@@ -36,7 +36,7 // require (\n \tgithub.com/googleapis/gax-go/v2 v2.12.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.2 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.4 // 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@@ -360,8 +360,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY\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.2 h1:uJDtyXwEfalmp1PqdxuhZqrNkUyClZAhVeZYTArbqkg=\n-github.com/hashicorp/go-getter v1.7.2/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n+github.com/hashicorp/go-getter v1.7.4 h1:3yQjWuxICvSpYwqSayAdKRFcvBl1y/vogCxczWSmix0=\n+github.com/hashicorp/go-getter v1.7.4/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:\n+36,7 -36,7 +36,7 @@ require (\n \tgithub.com/googleapis/gax-go/v2 v2.12.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.2 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.4 // 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@@ -360,8 +360,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY\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.2 h1:uJDtyXwEfalmp1PqdxuhZqrNkUyClZAhVeZYTArbqkg=\n-github.com/hashicorp/go-getter v1.7.2/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n+github.com/hashicorp/go-getter v1.7.4 h1:3yQjWuxICvSpYwqSayAdKRFcvBl1y/vogCxczWSmix0=\n+github.com/hashicorp/go-getter v1.7.4/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@@ -36,7 +36,7 @@ require (\n \tgithub.com/googleapis/gax-go/v2 v2.12.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.2 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.4 // 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@@ -360,8 +360,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY\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.2 h1:uJDtyXwEfalmp1PqdxuhZqrNkUyClZAhVeZYTArbqkg=\n-github.com/hashicorp/go-getter v1.7.2/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n+github.com/hashicorp/go-getter v1.7.4 h1:3yQjWuxICvSpYwqSayAdKRFcvBl1y/vogCxczWSmix0=\n+github.com/hashicorp/go-getter v1.7.4/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n github.com/hashicorp/go-multierror v1.7.4/go.mod 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:\nFixed #228 \n\n---\n\nChoice A:\nmodules/network-peering/main.tf\n@@ -17,11 +17,22 @@\n locals {\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 }\n \n+resource \"random_string\" \"network_peering_suffix\" {\n+ upper = false\n+ lower = true\n+ special = false\n+ length = 4\n+}\n resource \"google_compute_network_peering\" \"local_network_peering\" {\n provider = google-beta\n- name = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n+ name = local.local_network_peering_name\n network = var.local_network\n peer_network = var.peer_network\n export_custom_routes = var.export_local_custom_routes\n@@ -32,7 +43,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 = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n+ name = local.peer_network_peering_name\n network = var.peer_network\n peer_network = var.local_network\n export_custom_routes = var.export_peer_custom_routes\n---\n\n\n---\n\nChoice B:\nmodules/network-peering/main.tf\n@@ -17,11 +17,22 @@\n locals {\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 }\n \n+resource \"random_string\" \"network_peering_suffix\" {\n+ upper = false\n+ lower = true\n+ special = false\n+ length = 4\n+}\n resource \"google_compute_network_peering\" \"local_network_peering\" {\n provider = google-beta\n- name = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n+ name = local.local_network_peering_name\n network = var.local_network\n peer_network = var.peer_network\n export_custom_routes = var.export_local_custom_routes\n@@ -32,7 +43,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 = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n+ name = local.peer_network_peering_name\n network = var.peer_network\n peer_network = var.local_network\n peer_network_name export_custom_routes = var.export_peer_custom_routes\n---\n\n\n---\n\nChoice C:\nmodules/network-peering/main.tf\n@@ -17,11 +17,22 @@\n locals {\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 }\n \n+resource \"random_string\" \"network_peering_suffix\" {\n+ upper = false\n+ lower = true\n+ special = false\n+ length = 4\n+}\n resource \"google_compute_network_peering\" \"local_network_peering\" {\n provider = google-beta\n- name = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n+ name = local.local_network_peering_name\n network modules/network-peering/main.tf\n@@ = var.local_network\n peer_network = var.peer_network\n export_custom_routes = var.export_local_custom_routes\n@@ -32,7 +43,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 = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n+ name = local.peer_network_peering_name\n network = var.peer_network\n peer_network = var.local_network\n export_custom_routes = var.export_peer_custom_routes\n---\n\n\n---\n\nChoice D:\nmodules/network-peering/main.tf\n@@ -17,11 +17,22 @@\n locals {\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 }\n \n+resource \"random_string\" \"network_peering_suffix\" {\n+ upper = false\n+ lower = true\n+ special = false\n+ length = 4\n+}\n resource \"google_compute_network_peering\" \"local_network_peering\" {\n provider = google-beta\n- name = \"${var.prefix}-${local.local_network_name}-${local.peer_network_name}\"\n+ name = local.local_network_peering_name\n network = var.local_network\n peer_network = var.peer_network\n export_custom_routes = var.export_local_custom_routes\n@@ -32,7 +43,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 = \"${var.prefix}-${local.peer_network_name}-${local.local_network_name}\"\n+ name = local.peer_network_peering_name\n network = var.peer_network\n peer_network = var.local_network\n export_custom_routes = var.export_peer_custom_routes\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/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-policy/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.0.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-policy/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.0.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n @@ provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-policy/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.0.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:firewall-policy/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.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:\nNone\n\n---\n\nChoice A:\nmodules/network-firewall-policy/README.md\n@@ -9,7 +9,7 @@ Variable `rules` details are available [here](#firwall-policy-rules-format). Hig\n ```\n module \"firewall_rules\" {\n source = \"terraform-google-modules/network/google//modules/network-firewall-policy\"\n- version = \"~> 8.0\"\n+ version = \"~> 7.0\"\n project_id = var.project_id\n policy_name = \"my-firewall-policy\"\n description = \"Test firewall policy\"\n@@ -173,7 +173,7 @@ In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-poli\n enable_logging = true\n target_secure_tags = [\"tagValues/${google_tags_tag_value.tag_value.name}\",]\n target_service_accounts = [\"fw-test-svc-acct@$my-project-id.iam.gserviceaccount.com\"]\n- match = object({\n+ match = {\n src_ip_ranges = [\"10.100.0.2\"]\n src_fqdns = []\n src_region_codes = []\n---\n\n\n---\n\nChoice B:\nmodules/network-firewall-policy/README.md\n@@ -9,7 +9,7 @@ Variable `rules` details are available [here](#firwall-policy-rules-format). Hig\n ```\n module \"firewall_rules\" {\n source = \"terraform-google-modules/network/google//modules/network-firewall-policy\"\n- version = \"~> 8.0\"\n+ version = \"~> 7.0\"\n project_id = var.project_id\n policy_name = \"my-firewall-policy\"\n description = \"Test firewall policy\"\n@@ -173,7 +173,7 @@ In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-poli\n enable_logging = true\n target_secure_tags = [\"tagValues/${google_tags_tag_value.tag_value.name}\",]\n target_service_accounts = [\"fw-test-svc-acct@$my-project-id.iam.gserviceaccount.com\"]\n- match = object({\n+ match = {\n src_ip_ranges = [\"10.100.0.2\"]\n src_fqdns = []\n src_region_codes = []\n---\n\n\n---\n\nChoice C:\nmodules/network-firewall-policy/README.md\n@@ -9,7 +9,7 @@ Variable `rules` details are available [here](#firwall-policy-rules-format). Hig\n ```\n module \"firewall_rules\" {\n source = \"terraform-google-modules/network/google//modules/network-firewall-policy\"\n- version = \"~> 8.0\"\n+ version = \"~> 7.0\"\n project_id = var.project_id\n policy_name = \"my-firewall-policy\"\n description = \"Test firewall policy\"\n@@ -173,7 +173,7 @@ In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-poli\n enable_logging = true\n target_secure_tags = [\"tagValues/${google_tags_tag_value.tag_value.name}\",]\n target_service_accounts = [\"fw-test-svc-acct@$my-project-id.iam.gserviceaccount.com\"]\n- match = object({\n+ match = {\n src_ip_ranges = [\"10.100.0.2\"]\n src_fqdns = []\n src_region_codes = []\n---\n\n\n---\n\nChoice D:\nmodules/network-firewall-policy/README.md\n@@ -9,7 +9,7 @@ Variable `rules` details are available [here](#firwall-policy-rules-format). Hig\n ```\n module \"firewall_rules\" {\n source = \"terraform-google-modules/network/google//modules/network-firewall-policy\"\n- version = \"~> 8.0\"\n+ version = \"~> 7.0\"\n project_id = var.project_id\n policy_name = \"my-firewall-policy\"\n description = \"Test firewall policy\"\n@@ -173,7 +173,7 @@ In ```\n [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-poli\n enable_logging = true\n target_secure_tags = [\"tagValues/${google_tags_tag_value.tag_value.name}\",]\n target_service_accounts = [\"fw-test-svc-acct@$my-project-id.iam.gserviceaccount.com\"]\n- match = object({\n+ match = {\n src_ip_ranges = [\"10.100.0.2\"]\n src_fqdns = []\n src_region_codes = []\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:\nfix #477 \n\n---\n\nChoice A:\nbuild/int.cloudbuild.yaml\n@@ -168,7 +168,7 @@ steps:\n args: ['/bin/bash', '-c', 'cft test run TestPrivateServiceConnect --stage teardown --verbose']\n - id: converge global-firewall-policy\n waitFor:\n- - create all\n+ - destroy private-service-connect\n name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n args: ['/bin/bash', '-c', 'cft test run TestGlobalNetworkFirewallPolicy --stage apply --verbose']\n - id: verify global-firewall-policy\n@@ -183,7 +183,7 @@ steps:\n args: ['/bin/bash', '-c', 'cft test run TestGlobalNetworkFirewallPolicy --stage teardown --verbose']\n - id: converge regional-firewall-policy\n waitFor:\n- - create all\n+ - destroy global-firewall-policy\n name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n args: ['/bin/bash', '-c', 'cft test run TestRegionalNetworkFirewallPolicy --stage apply --verbose']\n - id: verify regional-firewall-policy\n@@ -198,7 +198,7 @@ steps:\n args: ['/bin/bash', '-c', 'cft test run TestRegionalNetworkFirewallPolicy --stage teardown --verbose']\n - id: converge firewall-rule\n waitFor:\n- - create all\n+ - destroy regional-firewall-policy\n name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n args: ['/bin/bash', '-c', 'cft test run TestAll/examples/bidirectional-firewall-rules --stage apply --verbose']\n - id: verify firewall-rule\n---\nexamples/global-network-firewall-policy/main.tf\n@@ -34,6 +34,11 @@ resource \"google_compute_network\" \"network\" {\n name = \"${local.prefix}-network\"\n }\n \n+resource \"google_compute_network\" \"network_backup\" {\n+ project = var.project_id\n+ name = \"${local.prefix}-network-backup\"\n+}\n+\n resource \"google_tags_tag_key\" \"tag_key\" {\n \n description = \"For keyname resources.\"\n@@ -74,7 +79,10 @@ module \"firewal_policy\" {\n project_id = var.project_id\n policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n description = \"test ${local.prefix} firewall policy\"\n- target_vpcs = [\"projects/${var.project_id}/global/networks/${local.prefix}-network\"]\n+ target_vpcs = [\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network\",\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network-backup\",\n+ ]\n \n rules = [\n {\n---\nexamples/regional-network-firewall-policy/main.tf\n@@ -36,6 +36,11 @@ resource \"google_compute_network\" \"network\" {\n name = \"${local.prefix}-network\"\n }\n \n+resource \"google_compute_network\" \"network_backup\" {\n+ project = var.project_id\n+ name = \"${local.prefix}-network-backup\"\n+}\n+\n resource \"google_tags_tag_key\" \"tag_key\" {\n \n description = \"For keyname resources.\"\n@@ -73,11 +78,15 @@ resource \"google_service_account\" \"service_account\" {\n }\n \n module \"firewal_policy\" {\n- source = \"../../modules/network-firewall-policy\"\n- project_id = var.project_id\n- policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n- description = \"test ${local.prefix} firewall policy\"\n- target_vpcs = [\"projects/${var.project_id}/global/networks/${local.prefix}-network\"]\n+ source = \"../../modules/network-firewall-policy\"\n+ project_id = var.project_id\n+ policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n+ description = \"test ${local.prefix} firewall policy\"\n+ target_vpcs = [\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network\",\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network-backup\",\n+ ]\n+\n policy_region = local.location\n \n rules = [\n---\nmodules/network-firewall-policy/README.md\n@@ -29,7 +29,7 @@ There are examples included for [global](https://github.com/terraform-google-mod\n ```hcl\n module \"firewall_rules\" {\n source = \"terraform-google-modules/network/google//modules/network-firewall-policy\"\n- version = \"~> 8.0\"\n+ version = \"~> 7.2\"\n project_id = var.project_id\n policy_name = \"my-firewall-policy\"\n description = \"Test firewall policy\"\n@@ -173,7 +173,7 @@ In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-poli\n enable_logging = true\n target_secure_tags = [\"tagValues/${google_tags_tag_value.tag_value.name}\",]\n target_service_accounts = [\"fw-test-svc-acct@$my-project-id.iam.gserviceaccount.com\"]\n- match = object({\n+ match = {\n src_ip_ranges = [\"10.100.0.2\"]\n src_fqdns = []\n src_region_codes = []\n---\nmodules/network-firewall-policy/main.tf\n@@ -30,7 +30,7 @@ resource \"google_compute_network_firewall_policy\" \"fw_policy\" {\n \n resource \"google_compute_network_firewall_policy_association\" \"vpc_associations\" {\n for_each = local.global && length(var.target_vpcs) > 0 ? { for x in var.target_vpcs : base64encode(x) => x } : {}\n- name = local.prefix\n+ name = \"${local.prefix}-${element(split(\"/\", each.value), length(split(\"/\", each.value)) - 1)}\"\n attachment_target = each.value\n firewall_policy = google_compute_network_firewall_policy.fw_policy[0].name\n project = var.project_id\n@@ -103,7 +103,7 @@ resource \"google_compute_region_network_firewall_policy\" \"fw_policy\" {\n \n resource \"google_compute_region_network_firewall_policy_association\" \"vpc_associations\" {\n for_each = !local.global && length(var.target_vpcs) > 0 ? { for x in var.target_vpcs : base64encode(x) => x } : {}\n- name = local.prefix\n+ name = \"${local.prefix}-${element(split(\"/\", each.value), length(split(\"/\", each.value)) - 1)}\"\n attachment_target = each.value\n firewall_policy = google_compute_region_network_firewall_policy.fw_policy[0].name\n = var.project_id\n---\n\n\n---\n\nChoice B:\nbuild/int.cloudbuild.yaml\n@@ -168,7 +168,7 @@ steps:\n args: ['/bin/bash', '-c', 'cft test run TestPrivateServiceConnect --stage teardown --verbose']\n - id: converge global-firewall-policy\n waitFor:\n- - create all\n+ - destroy private-service-connect\n name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n args: ['/bin/bash', '-c', 'cft test run TestGlobalNetworkFirewallPolicy --stage apply --verbose']\n - id: verify global-firewall-policy\n@@ -183,7 +183,7 @@ steps:\n args: ['/bin/bash', '-c', 'cft test run TestGlobalNetworkFirewallPolicy --stage teardown --verbose']\n - id: converge regional-firewall-policy\n waitFor:\n- - create all\n+ - destroy global-firewall-policy\n name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n args: ['/bin/bash', '-c', 'cft test run TestRegionalNetworkFirewallPolicy --stage apply --verbose']\n - id: verify regional-firewall-policy\n@@ -198,7 +198,7 @@ steps:\n args: ['/bin/bash', '-c', 'cft test run TestRegionalNetworkFirewallPolicy --stage teardown --verbose']\n - id: converge firewall-rule\n waitFor:\n- - create all\n+ - destroy regional-firewall-policy\n name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n args: ['/bin/bash', '-c', 'cft test run TestAll/examples/bidirectional-firewall-rules --stage apply --verbose']\n - id: verify firewall-rule\n---\nexamples/global-network-firewall-policy/main.tf\n@@ -34,6 +34,11 @@ resource \"google_compute_network\" \"network\" {\n name = \"${local.prefix}-network\"\n }\n \n+resource \"google_compute_network\" \"network_backup\" {\n+ project = var.project_id\n+ name = \"${local.prefix}-network-backup\"\n+}\n+\n resource \"google_tags_tag_key\" \"tag_key\" {\n \n description = \"For keyname resources.\"\n@@ -74,7 +79,10 @@ module \"firewal_policy\" {\n project_id = var.project_id\n policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n description = \"test ${local.prefix} firewall policy\"\n- target_vpcs = [\"projects/${var.project_id}/global/networks/${local.prefix}-network\"]\n+ target_vpcs = [\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network\",\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network-backup\",\n+ ]\n \n rules = resource {\n---\nexamples/regional-network-firewall-policy/main.tf\n@@ -36,6 +36,11 @@ resource \"google_compute_network\" \"network\" {\n name = \"${local.prefix}-network\"\n }\n \n+resource \"google_compute_network\" \"network_backup\" {\n+ project = var.project_id\n+ name = \"${local.prefix}-network-backup\"\n+}\n+\n resource \"google_tags_tag_key\" \"tag_key\" {\n \n description = \"For keyname resources.\"\n@@ -73,11 +78,15 @@ resource \"google_service_account\" \"service_account\" {\n }\n \n module \"firewal_policy\" {\n- source = \"../../modules/network-firewall-policy\"\n- project_id = var.project_id\n- policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n- description = \"test ${local.prefix} firewall policy\"\n- target_vpcs = [\"projects/${var.project_id}/global/networks/${local.prefix}-network\"]\n+ source = \"../../modules/network-firewall-policy\"\n+ project_id = var.project_id\n+ policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n+ description = \"test ${local.prefix} firewall policy\"\n+ target_vpcs = [\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network\",\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network-backup\",\n+ ]\n+\n policy_region = local.location\n \n rules = [\n---\nmodules/network-firewall-policy/README.md\n@@ -29,7 +29,7 @@ There are examples included for [global](https://github.com/terraform-google-mod\n ```hcl\n module \"firewall_rules\" {\n source = \"terraform-google-modules/network/google//modules/network-firewall-policy\"\n- version = \"~> 8.0\"\n+ version = \"~> 7.2\"\n project_id = var.project_id\n policy_name = \"my-firewall-policy\"\n description = \"Test firewall policy\"\n@@ -173,7 +173,7 @@ In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-poli\n enable_logging = true\n target_secure_tags = [\"tagValues/${google_tags_tag_value.tag_value.name}\",]\n target_service_accounts = [\"fw-test-svc-acct@$my-project-id.iam.gserviceaccount.com\"]\n- match = object({\n+ match = {\n src_ip_ranges = [\"10.100.0.2\"]\n src_fqdns = []\n src_region_codes = []\n---\nmodules/network-firewall-policy/main.tf\n@@ -30,7 +30,7 @@ resource \"google_compute_network_firewall_policy\" \"fw_policy\" {\n \n resource \"google_compute_network_firewall_policy_association\" \"vpc_associations\" {\n for_each = local.global && length(var.target_vpcs) > 0 ? { for x in var.target_vpcs : base64encode(x) => x } : {}\n- name = local.prefix\n+ name = \"${local.prefix}-${element(split(\"/\", each.value), length(split(\"/\", each.value)) - 1)}\"\n attachment_target = each.value\n firewall_policy = google_compute_network_firewall_policy.fw_policy[0].name\n project = var.project_id\n@@ -103,7 +103,7 @@ resource \"google_compute_region_network_firewall_policy\" \"fw_policy\" {\n \n resource \"google_compute_region_network_firewall_policy_association\" \"vpc_associations\" {\n for_each = !local.global && length(var.target_vpcs) > 0 ? { for x in var.target_vpcs : base64encode(x) => x } : {}\n- name = local.prefix\n+ name = \"${local.prefix}-${element(split(\"/\", each.value), length(split(\"/\", each.value)) - 1)}\"\n attachment_target = each.value\n firewall_policy = google_compute_region_network_firewall_policy.fw_policy[0].name\n project = var.project_id\n---\n\n\n---\n\nChoice C:\nbuild/int.cloudbuild.yaml\n@@ -168,7 +168,7 @@ steps:\n args: ['/bin/bash', '-c', 'cft test run TestPrivateServiceConnect --stage teardown --verbose']\n - id: converge global-firewall-policy\n waitFor:\n- - create all\n+ - destroy private-service-connect\n name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n args: ['/bin/bash', '-c', 'cft test run TestGlobalNetworkFirewallPolicy --stage apply --verbose']\n - id: verify global-firewall-policy\n@@ -183,7 +183,7 @@ steps:\n args: ['/bin/bash', '-c', 'cft test run TestGlobalNetworkFirewallPolicy --stage teardown --verbose']\n - id: converge regional-firewall-policy\n waitFor:\n- - create all\n+ - destroy global-firewall-policy\n name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n args: ['/bin/bash', '-c', 'cft test run TestRegionalNetworkFirewallPolicy --stage apply --verbose']\n - id: verify regional-firewall-policy\n@@ -198,7 +198,7 @@ steps:\n args: ['/bin/bash', '-c', 'cft test run TestRegionalNetworkFirewallPolicy --stage teardown --verbose']\n - id: converge firewall-rule\n waitFor:\n- - create all\n+ - destroy regional-firewall-policy\n name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n args: ['/bin/bash', '-c', 'cft test run TestAll/examples/bidirectional-firewall-rules --stage apply --verbose']\n - id: verify firewall-rule\n---\nexamples/global-network-firewall-policy/main.tf\n@@ -34,6 +34,11 @@ resource \"google_compute_network\" \"network\" {\n name = \"${local.prefix}-network\"\n }\n \n+resource \"google_compute_network\" \"network_backup\" {\n+ project = var.project_id\n+ name = \"${local.prefix}-network-backup\"\n+}\n+\n resource \"google_tags_tag_key\" \"tag_key\" {\n \n description = \"For keyname resources.\"\n@@ -74,7 +79,10 @@ module \"firewal_policy\" {\n project_id = var.project_id\n policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n description = \"test ${local.prefix} firewall policy\"\n- target_vpcs = [\"projects/${var.project_id}/global/networks/${local.prefix}-network\"]\n+ target_vpcs = [\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network\",\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network-backup\",\n+ ]\n \n rules = [\n {\n---\nexamples/regional-network-firewall-policy/main.tf\n@@ -36,6 +36,11 @@ resource \"google_compute_network\" \"network\" {\n name = \"${local.prefix}-network\"\n }\n \n+resource \"google_compute_network\" \"network_backup\" {\n+ project = var.project_id\n+ name = \"${local.prefix}-network-backup\"\n+}\n+\n resource \"google_tags_tag_key\" \"tag_key\" {\n \n description = \"For keyname resources.\"\n@@ -73,11 +78,15 @@ resource \"google_service_account\" \"service_account\" {\n }\n \n module \"firewal_policy\" {\n- source = \"../../modules/network-firewall-policy\"\n- project_id = var.project_id\n- policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n- description = \"test ${local.prefix} firewall policy\"\n- target_vpcs = [\"projects/${var.project_id}/global/networks/${local.prefix}-network\"]\n+ source = \"../../modules/network-firewall-policy\"\n+ project_id = var.project_id\n+ policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n+ description = \"test ${local.prefix} firewall policy\"\n+ target_vpcs = [\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network\",\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network-backup\",\n+ ]\n+\n policy_region = local.location\n \n rules = [\n---\nmodules/network-firewall-policy/README.md\n@@ -29,7 +29,7 @@ There are examples included for [global](https://github.com/terraform-google-mod\n ```hcl\n module \"firewall_rules\" {\n source = \"terraform-google-modules/network/google//modules/network-firewall-policy\"\n- version = \"~> 8.0\"\n+ version = \"~> 7.2\"\n project_id = var.project_id\n policy_name = \"my-firewall-policy\"\n description = \"Test firewall policy\"\n@@ -173,7 +173,7 @@ In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-poli\n enable_logging = true\n target_secure_tags = [\"tagValues/${google_tags_tag_value.tag_value.name}\",]\n target_service_accounts = [\"fw-test-svc-acct@$my-project-id.iam.gserviceaccount.com\"]\n- match = object({\n+ match = {\n src_ip_ranges = [\"10.100.0.2\"]\n src_fqdns = []\n src_region_codes = []\n---\nmodules/network-firewall-policy/main.tf\n@@ -30,7 +30,7 @@ resource \"google_compute_network_firewall_policy\" \"fw_policy\" {\n \n resource \"google_compute_network_firewall_policy_association\" \"vpc_associations\" {\n for_each = local.global && length(var.target_vpcs) > 0 ? { for x in var.target_vpcs : base64encode(x) => x } : {}\n- name = local.prefix\n+ name = \"${local.prefix}-${element(split(\"/\", each.value), length(split(\"/\", each.value)) - 1)}\"\n attachment_target = each.value\n firewall_policy = google_compute_network_firewall_policy.fw_policy[0].name\n project = var.project_id\n@@ -103,7 +103,7 @@ resource \"google_compute_region_network_firewall_policy\" \"fw_policy\" {\n \n resource \"google_compute_region_network_firewall_policy_association\" \"vpc_associations\" {\n for_each = !local.global && length(var.target_vpcs) > 0 ? { for x in var.target_vpcs : base64encode(x) => x } : {}\n- name = local.prefix\n+ name = \"${local.prefix}-${element(split(\"/\", each.value), length(split(\"/\", each.value)) - 1)}\"\n attachment_target = each.value\n firewall_policy = google_compute_region_network_firewall_policy.fw_policy[0].name\n project = var.project_id\n---\n\n\n---\n\nChoice D:\nbuild/int.cloudbuild.yaml\n@@ -168,7 +168,7 @@ steps:\n args: ['/bin/bash', '-c', 'cft test run TestPrivateServiceConnect --stage teardown --verbose']\n - id: converge global-firewall-policy\n waitFor:\n- - create all\n+ - destroy private-service-connect\n name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n args: ['/bin/bash', '-c', 'cft test run TestGlobalNetworkFirewallPolicy --stage apply --verbose']\n - id: verify global-firewall-policy\n@@ -183,7 +183,7 @@ steps:\n args: ['/bin/bash', '-c', 'cft test run TestGlobalNetworkFirewallPolicy --stage teardown --verbose']\n - id: converge regional-firewall-policy\n waitFor:\n- - create all\n+ - destroy global-firewall-policy\n name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n args: ['/bin/bash', '-c', 'cft test run TestRegionalNetworkFirewallPolicy --stage apply --verbose']\n - id: verify regional-firewall-policy\n@@ -198,7 +198,7 @@ steps:\n args: ['/bin/bash', '-c', 'cft test run TestRegionalNetworkFirewallPolicy --stage teardown --verbose']\n - id: converge firewall-rule\n waitFor:\n- - create all\n+ - destroy regional-firewall-policy\n name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n args: ['/bin/bash', '-c', 'cft test run TestAll/examples/bidirectional-firewall-rules --stage apply --verbose']\n - id: verify firewall-rule\n---\nexamples/global-network-firewall-policy/main.tf\n@@ -34,6 +34,11 @@ resource \"google_compute_network\" \"network\" {\n name = \"${local.prefix}-network\"\n }\n \n+resource \"google_compute_network\" \"network_backup\" {\n+ project = var.project_id\n+ name = \"${local.prefix}-network-backup\"\n+}\n+\n resource \"google_tags_tag_key\" \"tag_key\" {\n \n description = \"For keyname resources.\"\n@@ -74,7 +79,10 @@ module \"firewal_policy\" {\n project_id = var.project_id\n policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n description = \"test ${local.prefix} firewall policy\"\n- target_vpcs = [\"projects/${var.project_id}/global/networks/${local.prefix}-network\"]\n+ target_vpcs = [\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network\",\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network-backup\",\n+ ]\n \n rules = [\n {\n---\nexamples/regional-network-firewall-policy/main.tf\n@@ -36,6 +36,11 @@ resource \"google_compute_network\" \"network\" {\n name = \"${local.prefix}-network\"\n }\n \n+resource \"google_compute_network\" \"network_backup\" {\n+ project = var.project_id\n+ name = \"${local.prefix}-network-backup\"\n+}\n+\n resource \"google_tags_tag_key\" \"tag_key\" {\n \n description = \"For keyname resources.\"\n@@ -73,11 +78,15 @@ resource \"google_service_account\" \"service_account\" {\n }\n \n module \"firewal_policy\" {\n- source = \"../../modules/network-firewall-policy\"\n- project_id = var.project_id\n- policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n- description = \"test ${local.prefix} firewall policy\"\n- target_vpcs = [\"projects/${var.project_id}/global/networks/${local.prefix}-network\"]\n+ source = \"../../modules/network-firewall-policy\"\n+ project_id = var.project_id\n+ policy_name = \"${local.prefix}-firewall-policy-${random_string.random_suffix.result}\"\n+ description = \"test ${local.prefix} firewall policy\"\n+ target_vpcs = [\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network\",\n+ \"projects/${var.project_id}/global/networks/${local.prefix}-network-backup\",\n+ ]\n+\n policy_region = local.location\n \n rules = [\n---\nmodules/network-firewall-policy/README.md\n@@ -29,7 +29,7 @@ There are examples included for [global](https://github.com/terraform-google-mod\n ```hcl\n module \"firewall_rules\" {\n source = \"terraform-google-modules/network/google//modules/network-firewall-policy\"\n- version = \"~> 8.0\"\n+ version = \"~> 7.2\"\n project_id = var.project_id\n policy_name = \"my-firewall-policy\"\n description = \"Test firewall policy\"\n@@ resource +173,7 @@ In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-poli\n enable_logging = true\n target_secure_tags = [\"tagValues/${google_tags_tag_value.tag_value.name}\",]\n target_service_accounts = [\"fw-test-svc-acct@$my-project-id.iam.gserviceaccount.com\"]\n- match = object({\n+ match = {\n src_ip_ranges = [\"10.100.0.2\"]\n src_fqdns = []\n src_region_codes = []\n---\nmodules/network-firewall-policy/main.tf\n@@ -30,7 +30,7 @@ resource \"google_compute_network_firewall_policy\" \"fw_policy\" {\n \n resource \"google_compute_network_firewall_policy_association\" \"vpc_associations\" {\n for_each = local.global && length(var.target_vpcs) > 0 ? { for x in var.target_vpcs : base64encode(x) => x } : {}\n- name = local.prefix\n+ name = \"${local.prefix}-${element(split(\"/\", each.value), length(split(\"/\", each.value)) - 1)}\"\n attachment_target = each.value\n firewall_policy = google_compute_network_firewall_policy.fw_policy[0].name\n project = var.project_id\n@@ -103,7 +103,7 @@ resource \"google_compute_region_network_firewall_policy\" \"fw_policy\" {\n \n resource \"google_compute_region_network_firewall_policy_association\" \"vpc_associations\" {\n for_each = !local.global && length(var.target_vpcs) > 0 ? { for x in var.target_vpcs : base64encode(x) => x } : {}\n- name = local.prefix\n+ name = \"${local.prefix}-${element(split(\"/\", each.value), length(split(\"/\", each.value)) - 1)}\"\n attachment_target = each.value\n firewall_policy = google_compute_region_network_firewall_policy.fw_policy[0].name\n project = var.project_id\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:\nfix #505 \n\n---\n\nChoice A:\nmodules/network-firewall-policy/README.md\n@@ -135,7 +135,7 @@ module \"firewall_rules\" {\n | policy\\_name | User-provided name of the Network firewall policy | `string` | n/a | yes |\n | policy\\_region | Location of the firewall policy. Needed for regional firewall policies. Default is null (Global firewall policy) | `string` | `null` | no |\n | project\\_id | Project ID of the Network firewall policy | `string` | n/a | yes |\n-| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string), [])<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n+| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n | target\\_vpcs | List of target VPC IDs that the firewall policy will be attached to | `list(string)` | `[]` | no |\n \n ## Outputs\n---\nmodules/network-firewall-policy/variables.tf\n@@ -57,7 +57,7 @@ variable \"rules\" {\n description = optional(string)\n enable_logging = optional(bool)\n target_secure_tags = optional(list(string))\n- target_service_accounts = optional(list(string), [])\n+ target_service_accounts = optional(list(string))\n match = object({\n src_ip_ranges = optional(list(string), [])\n src_fqdns = optional(list(string), [])\n---\ntest/integration/global-network-firewall-policy/global_firewall_policy_test.go\n@@ -55,8 +55,8 @@ func TestGlobalNetworkFirewallPolicy(t *testing.T) {\n \t\t\tassert.Equal(\"10.100.0.1/32\", sp1.Get(\"match.srcIpRanges\").Array()[0].String(), \"has expected srcIpRanges\")\n \t\t\tassert.Equal(\"US\", sp1.Get(\"match.srcRegionCodes\").Array()[0].String(), \"has expected srcRegionCodes\")\n \t\t\tassert.Equal(\"all\", sp1.Get(\"match.layer4Configs\").Array()[0].Get(\"ipProtocol\").String(), \"has expected layer4Configs.ipProtocol\")\n-\t\t\tsecureTags := sp1.Get(\"match.srcSecureTags\").Array()\n-\t\t\tassert.Equal(1, len(secureTags), \"should have the correct srcSecureTags count\")\n+\t\t\tsecureTags1 := sp1.Get(\"match.srcSecureTags\").Array()\n+\t\t\tassert.Equal(1, len(secureTags1), \"should have the correct srcSecureTags count - 1\")\n \t\t\tsrcAddressGroups := sp1.Get(\"match.srcAddressGroups\").Array()\n \t\t\tassert.Equal(1, len(srcAddressGroups), \"should have the correct srcAddressGroups count\")\n \n@@ -72,6 +72,8 @@ func TestGlobalNetworkFirewallPolicy(t *testing.T) {\n \t\t\tassert.Equal(\"10.100.0.2/32\", sp2.Get(\"match.srcIpRanges\").Array()[0].String(), \"has expected srcIpRanges\")\n \t\t\tassert.Equal(\"BE\", sp2.Get(\"match.srcRegionCodes\").Array()[0].String(), \"has expected srcRegionCodes\")\n \t\t\tassert.Equal(\"all\", sp2.Get(\"match.layer4Configs\").Array()[0].Get(\"ipProtocol\").String(), \"has expected layer4Configs.ipProtocol\")\n+\t\t\tsecureTags2 := sp2.Get(\"targetSecureTags\").Array()\n+\t\t\tassert.Equal(1, len(secureTags2), \"should have the correct targetSecureTags count - 1\")\n \n \t\t\trule3 := gcloud.Runf(t, \"compute network-firewall-policies rules describe 3 --global-firewall-policy --firewall-policy %s --project %s\", policyName, projectId)\n \t\t\tsp3 := rule3.Array()[0]\n@@ -116,6 +118,8 @@ func TestGlobalNetworkFirewallPolicy(t *testing.T) {\n \t\t\tassert.Equal(\"10.100.0.2/32\", sp102.Get(\"match.destIpRanges\").Array()[0].String(), \"has expected destIpRanges\")\n \t\t\tassert.Equal(\"AR\", sp102.Get(\"match.destRegionCodes\").Array()[0].String(), \"has expected destRegionCodes\")\n \t\t\tassert.Equal(\"all\", sp102.Get(\"match.layer4Configs\").Array()[0].Get(\"ipProtocol\").String(), \"has expected layer4Configs.ipProtocol\")\n+\t\t\tsecureTags102 := sp2.Get(\"targetSecureTags\").Array()\n+\t\t\tassert.Equal(1, len(secureTags102), \"should have the correct targetSecureTags count - 1\")\n \n \t\t\trule103 := gcloud.Runf(t, \"compute network-firewall-policies rules describe 103 --global-firewall-policy --firewall-policy %s --project %s\", policyName, projectId)\n \t\t\tsp103 := rule103.Array()[0]\n---\n\n\n---\n\nChoice B:\nmodules/network-firewall-policy/README.md\n@@ -135,7 +135,7 @@ module \"firewall_rules\" {\n | policy\\_name | User-provided name of the Network firewall policy | `string` | n/a | yes |\n | policy\\_region | Location of the firewall policy. Needed for regional firewall policies. Default is null (Global firewall policy) | `string` | `null` | no |\n | project\\_id | Project ID of the Network firewall policy | `string` | n/a | yes |\n-| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string), [])<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n+| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n | target\\_vpcs | List of target VPC IDs that the firewall policy will be attached to | `list(string)` | `[]` | no |\n \n ## Outputs\n---\nmodules/network-firewall-policy/variables.tf\n@@ -57,7 +57,7 @@ variable \"rules\" {\n description = optional(string)\n enable_logging = optional(bool)\n target_secure_tags = optional(list(string))\n- target_service_accounts = optional(list(string), [])\n+ target_service_accounts = optional(list(string))\n match = object({\n src_ip_ranges = optional(list(string), [])\n src_fqdns = optional(list(string), [])\n---\ntest/integration/global-network-firewall-policy/global_firewall_policy_test.go\n@@ -55,8 +55,8 @@ func TestGlobalNetworkFirewallPolicy(t *testing.T) {\n \t\t\tassert.Equal(\"10.100.0.1/32\", sp1.Get(\"match.srcIpRanges\").Array()[0].String(), \"has expected srcIpRanges\")\n \t\t\tassert.Equal(\"US\", sp1.Get(\"match.srcRegionCodes\").Array()[0].String(), \"has expected srcRegionCodes\")\n \t\t\tassert.Equal(\"all\", sp1.Get(\"match.layer4Configs\").Array()[0].Get(\"ipProtocol\").String(), \"has expected layer4Configs.ipProtocol\")\n-\t\t\tsecureTags := sp1.Get(\"match.srcSecureTags\").Array()\n-\t\t\tassert.Equal(1, len(secureTags), \"should have the correct srcSecureTags count\")\n+\t\t\tsecureTags1 := sp1.Get(\"match.srcSecureTags\").Array()\n+\t\t\tassert.Equal(1, len(secureTags1), \"should have the correct srcSecureTags count - 1\")\n \t\t\tsrcAddressGroups := sp1.Get(\"match.srcAddressGroups\").Array()\n \t\t\tassert.Equal(1, len(srcAddressGroups), \"should have the correct srcAddressGroups count\")\n \n@@ -72,6 +72,8 @@ func TestGlobalNetworkFirewallPolicy(t *testing.T) {\n \t\t\tassert.Equal(\"10.100.0.2/32\", sp2.Get(\"match.srcIpRanges\").Array()[0].String(), \"has expected srcIpRanges\")\n \t\t\tassert.Equal(\"BE\", sp2.Get(\"match.srcRegionCodes\").Array()[0].String(), \"has expected srcRegionCodes\")\n \t\t\tassert.Equal(\"all\", sp2.Get(\"match.layer4Configs\").Array()[0].Get(\"ipProtocol\").String(), \"has expected layer4Configs.ipProtocol\")\n+\t\t\tsecureTags2 := sp2.Get(\"targetSecureTags\").Array()\n+\t\t\tassert.Equal(1, len(secureTags2), \"should have the correct targetSecureTags count - 1\")\n \n \t\t\trule3 := gcloud.Runf(t, \"compute network-firewall-policies rules describe 3 --global-firewall-policy --firewall-policy %s --project %s\", policyName, projectId)\n \t\t\tsp3 := rule3.Array()[0]\n@@ -116,6 +118,8 @@ func TestGlobalNetworkFirewallPolicy(t *testing.T) {\n \t\t\tassert.Equal(\"10.100.0.2/32\", sp102.Get(\"match.destIpRanges\").Array()[0].String(), \"has expected destIpRanges\")\n \t\t\tassert.Equal(\"AR\", sp102.Get(\"match.destRegionCodes\").Array()[0].String(), \"has expected destRegionCodes\")\n \t\t\tassert.Equal(\"all\", sp102.Get(\"match.layer4Configs\").Array()[0].Get(\"ipProtocol\").String(), \"has expected layer4Configs.ipProtocol\")\n+\t\t\tsecureTags102 := sp2.Get(\"targetSecureTags\").Array()\n+\t\t\tassert.Equal(1, len(secureTags102), \"should have the correct targetSecureTags count - 1\")\n \n \t\t\trule103 := gcloud.Runf(t, \"compute network-firewall-policies rules describe 103 --global-firewall-policy --firewall-policy %s --project %s\", policyName, projectId)\n \t\t\tsp103 := rule103.Array()[0]\n---\n\n\n---\n\nChoice C:\nmodules/network-firewall-policy/README.md\n@@ -135,7 +135,7 @@ module \"firewall_rules\" {\n | policy\\_name | User-provided name of the Network firewall policy | `string` | n/a | yes |\n | policy\\_region | Location of the firewall policy. Needed for regional firewall policies. Default is null (Global firewall policy) | `string` | `null` | no |\n | project\\_id | Project ID of the Network firewall policy | `string` | n/a | yes |\n-| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string), [])<br> match = object({<br> src_ip_ranges | = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n+| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n | target\\_vpcs | List of target VPC IDs that the firewall policy will be attached to | `list(string)` | `[]` | no |\n \n ## Outputs\n---\nmodules/network-firewall-policy/variables.tf\n@@ -57,7 +57,7 @@ variable \"rules\" {\n description = optional(string)\n enable_logging = optional(bool)\n target_secure_tags = optional(list(string))\n- target_service_accounts = optional(list(string), [])\n+ target_service_accounts = optional(list(string))\n match = object({\n src_ip_ranges = optional(list(string), [])\n src_fqdns = optional(list(string), [])\n---\ntest/integration/global-network-firewall-policy/global_firewall_policy_test.go\n@@ -55,8 +55,8 @@ func TestGlobalNetworkFirewallPolicy(t *testing.T) {\n \t\t\tassert.Equal(\"10.100.0.1/32\", sp1.Get(\"match.srcIpRanges\").Array()[0].String(), \"has expected srcIpRanges\")\n \t\t\tassert.Equal(\"US\", sp1.Get(\"match.srcRegionCodes\").Array()[0].String(), \"has expected srcRegionCodes\")\n \t\t\tassert.Equal(\"all\", sp1.Get(\"match.layer4Configs\").Array()[0].Get(\"ipProtocol\").String(), \"has expected layer4Configs.ipProtocol\")\n-\t\t\tsecureTags := sp1.Get(\"match.srcSecureTags\").Array()\n-\t\t\tassert.Equal(1, len(secureTags), \"should have the correct srcSecureTags count\")\n+\t\t\tsecureTags1 := sp1.Get(\"match.srcSecureTags\").Array()\n+\t\t\tassert.Equal(1, len(secureTags1), \"should have the correct srcSecureTags count - 1\")\n \t\t\tsrcAddressGroups := sp1.Get(\"match.srcAddressGroups\").Array()\n \t\t\tassert.Equal(1, len(srcAddressGroups), \"should have the correct srcAddressGroups count\")\n \n@@ -72,6 +72,8 @@ func TestGlobalNetworkFirewallPolicy(t *testing.T) {\n \t\t\tassert.Equal(\"10.100.0.2/32\", sp2.Get(\"match.srcIpRanges\").Array()[0].String(), \"has expected srcIpRanges\")\n \t\t\tassert.Equal(\"BE\", sp2.Get(\"match.srcRegionCodes\").Array()[0].String(), \"has expected srcRegionCodes\")\n \t\t\tassert.Equal(\"all\", sp2.Get(\"match.layer4Configs\").Array()[0].Get(\"ipProtocol\").String(), \"has expected layer4Configs.ipProtocol\")\n+\t\t\tsecureTags2 := sp2.Get(\"targetSecureTags\").Array()\n+\t\t\tassert.Equal(1, len(secureTags2), \"should have the correct targetSecureTags count - 1\")\n \n \t\t\trule3 := gcloud.Runf(t, \"compute network-firewall-policies rules describe 3 --global-firewall-policy --firewall-policy %s --project %s\", policyName, projectId)\n \t\t\tsp3 := rule3.Array()[0]\n@@ -116,6 +118,8 @@ func TestGlobalNetworkFirewallPolicy(t *testing.T) {\n \t\t\tassert.Equal(\"10.100.0.2/32\", sp102.Get(\"match.destIpRanges\").Array()[0].String(), \"has expected destIpRanges\")\n \t\t\tassert.Equal(\"AR\", sp102.Get(\"match.destRegionCodes\").Array()[0].String(), \"has expected destRegionCodes\")\n \t\t\tassert.Equal(\"all\", sp102.Get(\"match.layer4Configs\").Array()[0].Get(\"ipProtocol\").String(), \"has expected layer4Configs.ipProtocol\")\n+\t\t\tsecureTags102 := sp2.Get(\"targetSecureTags\").Array()\n+\t\t\tassert.Equal(1, len(secureTags102), \"should have the correct targetSecureTags count - 1\")\n \n \t\t\trule103 := gcloud.Runf(t, \"compute network-firewall-policies rules describe 103 --global-firewall-policy --firewall-policy %s --project %s\", policyName, projectId)\n \t\t\tsp103 := rule103.Array()[0]\n---\n\n\n---\n\nChoice D:\nmodules/network-firewall-policy/README.md\n@@ -135,7 +135,7 @@ module \"firewall_rules\" {\n | policy\\_name | User-provided name of the Network firewall policy | `string` | n/a | yes |\n | policy\\_region | Location of the firewall policy. Needed for regional firewall policies. Default is null (Global firewall policy) | `string` | `null` | no |\n | project\\_id | Project ID of the Network firewall policy | `string` | n/a | yes |\n-| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string), [])<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n+| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n | target\\_vpcs | List of target VPC IDs that the firewall policy will be attached to | `list(string)` | `[]` | no |\n \n ## Outputs\n---\nmodules/network-firewall-policy/variables.tf\n@@ -57,7 +57,7 @@ variable \"rules\" {\n description = optional(string)\n enable_logging = optional(bool)\n target_secure_tags = optional(list(string))\n- target_service_accounts = optional(list(string), [])\n+ target_service_accounts = optional(list(string))\n match = object({\n src_ip_ranges = optional(list(string), [])\n src_fqdns = optional(list(string), [])\n---\ntest/integration/global-network-firewall-policy/global_firewall_policy_test.go\n@@ -55,8 +55,8 @@ func TestGlobalNetworkFirewallPolicy(t *testing.T) {\n \t\t\tassert.Equal(\"10.100.0.1/32\", sp1.Get(\"match.srcIpRanges\").Array()[0].String(), \"has expected srcIpRanges\")\n \t\t\tassert.Equal(\"US\", sp1.Get(\"match.srcRegionCodes\").Array()[0].String(), \"has expected srcRegionCodes\")\n \t\t\tassert.Equal(\"all\", sp1.Get(\"match.layer4Configs\").Array()[0].Get(\"ipProtocol\").String(), \"has expected layer4Configs.ipProtocol\")\n-\t\t\tsecureTags := sp1.Get(\"match.srcSecureTags\").Array()\n-\t\t\tassert.Equal(1, len(secureTags), \"should have the correct srcSecureTags count\")\n+\t\t\tsecureTags1 := sp1.Get(\"match.srcSecureTags\").Array()\n+\t\t\tassert.Equal(1, len(secureTags1), \"should have the correct srcSecureTags count - 1\")\n \t\t\tsrcAddressGroups := sp1.Get(\"match.srcAddressGroups\").Array()\n \t\t\tassert.Equal(1, len(srcAddressGroups), \"should have the correct srcAddressGroups count\")\n \n@@ -72,6 +72,8 @@ func TestGlobalNetworkFirewallPolicy(t *testing.T) {\n \t\t\tassert.Equal(\"10.100.0.2/32\", sp2.Get(\"match.srcIpRanges\").Array()[0].String(), \"has expected srcIpRanges\")\n \t\t\tassert.Equal(\"BE\", sp2.Get(\"match.srcRegionCodes\").Array()[0].String(), \"has expected srcRegionCodes\")\n \t\t\tassert.Equal(\"all\", sp2.Get(\"match.layer4Configs\").Array()[0].Get(\"ipProtocol\").String(), \"has expected layer4Configs.ipProtocol\")\n+\t\t\tsecureTags2 := sp2.Get(\"targetSecureTags\").Array()\n+\t\t\tassert.Equal(1, len(secureTags2), \"should have the correct targetSecureTags count - 1\")\n \n \t\t\trule3 := gcloud.Runf(t, \"compute network-firewall-policies rules describe 3 --global-firewall-policy --firewall-policy %s --project %s\", policyName, projectId)\n \t\t\tsp3 := rule3.Array()[0]\n@@ -116,6 +118,8 @@ func TestGlobalNetworkFirewallPolicy(t *testing.T) {\n \t\t\tassert.Equal(\"10.100.0.2/32\", sp102.Get(\"match.destIpRanges\").Array()[0].String(), \"has expected destIpRanges\")\n \t\t\tassert.Equal(\"AR\", sp102.Get(\"match.destRegionCodes\").Array()[0].String(), \"has expected destRegionCodes\")\n \t\t\tassert.Equal(\"all\", sp102.Get(\"match.layer4Configs\").Array()[0].Get(\"ipProtocol\").String(), \"has expected layer4Configs.ipProtocol\")\n+\t\t\tsecureTags102 := sp2.Get(\"targetSecureTags\").Array()\n+\t\t\tassert.Equal(1, len(secureTags102), \"should have the correct targetSecureTags count - 1\")\n \n \t\t\trule103 := gcloud.Runf(t, \"compute network-firewall-policies rules describe 103 --global-firewall-policy --firewall-policy %s --project %s\", policyName, projectId)\n \t\t\tsp103 := rule103.Array()[0]\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/network-firewall-policy/README.md\n@@ -1,6 +1,6 @@\n # Google Cloud VPC Firewall Policy\n \n-This module allows creation of [Global](https://cloud.google.com/firewall/docs/network-firewall-policies) and [Regional](https://cloud.google.com/firewall/docs/regional-firewall-policies) Network Firewall Policy and [Rules](https://cloud.google.com/firewall/docs/firewall-policies-rule-details). It can also attach network firewall policy to multiple VPCs. Module will create a `Global` network firewall policy if a value is provided for the for `policy_region`, otherwise a `Regional` network firewall policy will be created. Module can create both [Cloud Firewall Essentials](https://cloud.google.com/firewall/docs/about-firewalls#firewall-essentials) and [Cloud Firewall Standard](https://cloud.google.com/firewall/docs/about-firewalls#firewall-standard) tier rules. Firewall Rules and Target VPC attachment is optional.\n+This module allows creation of [Global](https://cloud.google.com/firewall/docs/network-firewall-policies) and [Regional](https://cloud.google.com/firewall/docs/regional-firewall-policies) Network Firewall Policy and [Rules](https://cloud.google.com/firewall/docs/firewall-policies-rule-details). It can also attach network firewall policy to multiple VPCs. Module will create a `Regional` network firewall policy if a value is provided for the variable `policy_region`, otherwise a `Global` network firewall policy will be created. Module can create both [Cloud Firewall Essentials](https://cloud.google.com/firewall/docs/about-firewalls#firewall-essentials) and [Cloud Firewall Standard](https://cloud.google.com/firewall/docs/about-firewalls#firewall-standard) tier rules. Firewall Rules and Target VPC attachment is optional.\n \n ## Module Format\n \n---\n\n\n---\n\nChoice B:\nmodules/network-firewall-policy/README.md\n@@ -1,6 +1,6 @@\n # Google Cloud VPC Firewall Policy\n \n-This module allows creation of [Global](https://cloud.google.com/firewall/docs/network-firewall-policies) and [Regional](https://cloud.google.com/firewall/docs/regional-firewall-policies) Network Firewall Policy and [Rules](https://cloud.google.com/firewall/docs/firewall-policies-rule-details). It can also attach network firewall policy to multiple VPCs. Module will create a `Global` network firewall policy if a value is provided for the variable `policy_region`, otherwise a `Regional` network firewall policy will be created. Module can create both [Cloud Firewall Essentials](https://cloud.google.com/firewall/docs/about-firewalls#firewall-essentials) and [Cloud Firewall Standard](https://cloud.google.com/firewall/docs/about-firewalls#firewall-standard) tier rules. Firewall Rules and Target VPC attachment is optional.\n+This module allows creation of [Global](https://cloud.google.com/firewall/docs/network-firewall-policies) and [Regional](https://cloud.google.com/firewall/docs/regional-firewall-policies) Network Firewall Policy and [Rules](https://cloud.google.com/firewall/docs/firewall-policies-rule-details). It can also attach network firewall policy to multiple VPCs. Module will create a `Regional` network firewall policy if a value is provided for the variable `policy_region`, otherwise a `Global` network firewall policy will be created. Module can create both [Cloud Firewall Essentials](https://cloud.google.com/firewall/docs/about-firewalls#firewall-essentials) and [Cloud Firewall Standard](https://cloud.google.com/firewall/docs/about-firewalls#firewall-standard) tier rules. Firewall Rules and Target VPC attachment is optional.\n \n ## Module Format\n \n---\n\n\n---\n\nChoice C:\nmodules/network-firewall-policy/README.md\n@@ -1,6 +1,6 @@\n # Google Cloud VPC Firewall Policy\n \n-This module allows creation of [Global](https://cloud.google.com/firewall/docs/network-firewall-policies) and [Regional](https://cloud.google.com/firewall/docs/regional-firewall-policies) Network Firewall Policy and [Rules](https://cloud.google.com/firewall/docs/firewall-policies-rule-details). It can also attach network firewall policy to multiple VPCs. Module will create a `Global` network firewall policy if a value is provided for the variable `policy_region`, otherwise a `Regional` network firewall policy will be created. Module can create both [Cloud Firewall Essentials](https://cloud.google.com/firewall/docs/about-firewalls#firewall-essentials) and [Cloud Firewall Standard](https://cloud.google.com/firewall/docs/about-firewalls#firewall-standard) tier rules. Firewall Rules and Target VPC attachment is optional.\n+This module allows creation of [Global](https://cloud.google.com/firewall/docs/network-firewall-policies) and [Regional](https://cloud.google.com/firewall/docs/regional-firewall-policies) Network Firewall Firewall and [Rules](https://cloud.google.com/firewall/docs/firewall-policies-rule-details). It can also attach network firewall policy to multiple VPCs. Module will create a `Regional` network firewall policy if a value is provided for the variable `policy_region`, otherwise a `Global` network firewall policy will be created. Module can create both [Cloud Firewall Essentials](https://cloud.google.com/firewall/docs/about-firewalls#firewall-essentials) and [Cloud Firewall Standard](https://cloud.google.com/firewall/docs/about-firewalls#firewall-standard) tier rules. Firewall Rules and Target VPC attachment is optional.\n \n ## Module Format\n \n---\n\n\n---\n\nChoice D:\nmodules/network-firewall-policy/README.md\n@@ -1,6 +1,6 @@\n # Google Cloud VPC Firewall Policy\n \n-This module allows creation of [Global](https://cloud.google.com/firewall/docs/network-firewall-policies) and [Regional](https://cloud.google.com/firewall/docs/regional-firewall-policies) Network Firewall Policy and [Rules](https://cloud.google.com/firewall/docs/firewall-policies-rule-details). It can also attach network firewall policy to multiple VPCs. Module will create a `Global` network firewall policy if a value is provided for the variable `policy_region`, otherwise a `Regional` network firewall policy will be created. Module can create both [Cloud Firewall Essentials](https://cloud.google.com/firewall/docs/about-firewalls#firewall-essentials) and [Cloud Firewall Standard](https://cloud.google.com/firewall/docs/about-firewalls#firewall-standard) tier rules. Firewall Rules and Target VPC attachment is optional.\n+This module allows creation of [Global](https://cloud.google.com/firewall/docs/network-firewall-policies) and [Regional](https://cloud.google.com/firewall/docs/regional-firewall-policies) Network Firewall Policy and [Rules](https://cloud.google.com/firewall/docs/firewall-policies-rule-details). It can also attach network firewall policy to multiple VPCs. Module will create a `Regional` network firewall policy if a value is provided for the variable `policy_region`, otherwise a `Global` network firewall policy will be created. Module can create both [Cloud Firewall Essentials](https://cloud.google.com/firewall/docs/about-firewalls#firewall-essentials) and [Cloud Firewall Standard](https://cloud.google.com/firewall/docs/about-firewalls#firewall-standard) tier rules. Firewall Rules and Target VPC attachment is optional.\n \n ## policy Module Format\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:\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = google-beta 3.50\"\n+ version = \">= 3.50, < 5.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.50\"\n+ version = \">= 3.50, < 5.0\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0\"\n+ version = \">= 3.0, < 5.0\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62\"\n+ version = \">= 3.62, < 5.0\"\n }\n }\n \n---\n\n\n---\n\nChoice B:\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.50\"\n+ version = \">= 3.50, < 5.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.50\"\n+ version = \">= 3.50, < 5.0\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0\"\n+ version = \">= 3.0, < 5.0\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62\"\n+ version = \">= 3.62, < 5.0\"\n }\n }\n \n---\n\n\n---\n\nChoice C:\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.50\"\n+ version = \">= 3.50, < 5.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.50\"\n+ version = \">= 3.50, < 5.0\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0\"\n+ version = \">= 3.0, < 5.0\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62\"\n+ version = \">= 3.62, < 5.0\"\n }\n }\n \n---\n\n\n---\n\nChoice D:\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.50\"\n+ version = \">= 3.50, < 5.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.50\"\n+ version = \">= 3.50, < 5.0\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0\"\n+ version = \">= 3.0, < 5.0\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62\"\n+ version = \">= 3.62, < 5.0\"\n }\n source \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:\nBumps google.golang.org/protobuf from 1.31.0 to 1.33.0.\n\n\n[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/terraform-google-modules/terraform-google-network/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -75,7 +75,7 @@ require (\n \tgoogle.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/grpc v1.58.3 // indirect\n-\tgoogle.golang.org/protobuf v1.31.0 // indirect\n+\tgoogle.golang.org/protobuf v1.33.0 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n \tk8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect\n \tsigs.k8s.io/kustomize/kyaml v0.16.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,6 @@ 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.11.1 h1:S4Y7o5RKRC9Bk71VszCx9NeheWjdSAn5ejPuD1W6lNE=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1/go.mod h1:v4TFK9TmX4mYyXL3v9wFXVN3A5vrt2LaVDBX2/OVU7Y=\n github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0 h1:vZMVSILlQW/C1wF8w4jiQO5N98kBUiSsGcJAkcA2EFg=\n github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0/go.mod h1:iipeDC0VhxKtIVOZyz0ofiJ2x6sh9+VYEbG3JKsPqPw=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n@@ -441,13 +439,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n-github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=\n-github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=\n github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n@@ -524,8 +518,6 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=\n-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=\n golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n@@ -683,8 +675,6 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc\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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=\n-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n@@ -988,8 +978,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ\n google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=\n google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=\n google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=\n-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=\n-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=\n+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=\n+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=\n gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=\n gopkg.in/check.v1 golang.org/x/term h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=\n gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -75,7 +75,7 @@ require (\n \tgoogle.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/grpc v1.58.3 // indirect\n-\tgoogle.golang.org/protobuf v1.31.0 // indirect\n+\tgoogle.golang.org/protobuf v1.33.0 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n \tk8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect\n \tsigs.k8s.io/kustomize/kyaml v0.16.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,6 @@ 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.11.1 h1:S4Y7o5RKRC9Bk71VszCx9NeheWjdSAn5ejPuD1W6lNE=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1/go.mod h1:v4TFK9TmX4mYyXL3v9wFXVN3A5vrt2LaVDBX2/OVU7Y=\n github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0 h1:vZMVSILlQW/C1wF8w4jiQO5N98kBUiSsGcJAkcA2EFg=\n github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0/go.mod h1:iipeDC0VhxKtIVOZyz0ofiJ2x6sh9+VYEbG3JKsPqPw=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n@@ -441,13 +439,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n-github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=\n-github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=\n github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n@@ -524,8 +518,6 @@ golang.org/x/mod v1.28.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=\n-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=\n golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n@@ -683,8 +675,6 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc\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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=\n-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n@@ -988,8 +978,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ\n google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=\n google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=\n google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=\n-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=\n-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=\n+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=\n+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=\n gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=\n gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=\n gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -75,7 +75,7 @@ require (\n \tgoogle.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/grpc v1.58.3 // indirect\n-\tgoogle.golang.org/protobuf v1.31.0 // indirect\n+\tgoogle.golang.org/protobuf v1.33.0 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n \tk8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect\n \tsigs.k8s.io/kustomize/kyaml v0.16.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,6 @@ 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.11.1 h1:S4Y7o5RKRC9Bk71VszCx9NeheWjdSAn5ejPuD1W6lNE=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1/go.mod h1:v4TFK9TmX4mYyXL3v9wFXVN3A5vrt2LaVDBX2/OVU7Y=\n github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0 h1:vZMVSILlQW/C1wF8w4jiQO5N98kBUiSsGcJAkcA2EFg=\n github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0/go.mod h1:iipeDC0VhxKtIVOZyz0ofiJ2x6sh9+VYEbG3JKsPqPw=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n@@ -441,13 +439,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n-github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=\n-github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=\n github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n@@ -524,8 +518,6 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=\n-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=\n golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n@@ -683,8 +675,6 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc\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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=\n-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n@@ -988,8 +978,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ\n google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=\n google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=\n google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=\n-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=\n-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=\n+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=\n+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=\n gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=\n gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=\n gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -75,7 +75,7 @@ require (\n \tgoogle.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/grpc v1.58.3 // indirect\n-\tgoogle.golang.org/protobuf v1.31.0 // indirect\n+\tgoogle.golang.org/protobuf v1.33.0 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n \tk8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect\n \tsigs.k8s.io/kustomize/kyaml v0.16.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,6 @@ 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.11.1 h1:S4Y7o5RKRC9Bk71VszCx9NeheWjdSAn5ejPuD1W6lNE=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1/go.mod h1:v4TFK9TmX4mYyXL3v9wFXVN3A5vrt2LaVDBX2/OVU7Y=\n github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n h1:vZMVSILlQW/C1wF8w4jiQO5N98kBUiSsGcJAkcA2EFg=\n github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0/go.mod h1:iipeDC0VhxKtIVOZyz0ofiJ2x6sh9+VYEbG3JKsPqPw=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n@@ -441,13 +439,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n-github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=\n-github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=\n github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n@@ -524,8 +518,6 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=\n-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=\n golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n@@ -683,8 +675,6 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc\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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=\n-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=\n golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n@@ -988,8 +978,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ\n google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=\n google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=\n google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=\n-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=\n-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=\n+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=\n+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=\n gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=\n gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=\n gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=\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:\nHi, I would propose to add optional variable of `project_region` for this module.\r\n\r\nThe idea is to allow specifying custom, not in us-central1, namespace link.\n\n---\n\nChoice A:\ndocs/upgrading_to_v10.0.0.md\n@@ -0,0 +1,5 @@\n+# Upgrading to v10.0.0\n+\n+The v10.0 release contains backwards-incompatible changes.\n+\n+This update requires upgrading the minimum provider version of `hashicorp/google` from `3.50` to `5.8` and `hashicorp/google-beta` from `3.50` to `5.8`.\n---\nmodules/private-service-connect/README.md\n@@ -57,6 +57,8 @@ If you have a firewall rule blocking egress traffic, you will need to configure\n | private\\_service\\_connect\\_ip | The internal IP to be used for the private service connect. | `string` | n/a | yes |\n | private\\_service\\_connect\\_name | Private Service Connect endpoint name. Defaults to `global-psconnect-ip` | `string` | `\"global-psconnect-ip\"` | no |\n | project\\_id | Project ID for Private Service Connect. | `string` | n/a | yes |\n+| service\\_directory\\_namespace | Service Directory namespace to register the forwarding rule under. | `string` | `null` | no |\n+| service\\_directory\\_region | Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined. | `string` | `null` | no |\n \n ## Outputs\n \n---\nmodules/private-service-connect/main.tf\n@@ -38,4 +38,13 @@ resource \"google_compute_global_forwarding_rule\" \"forwarding_rule_private_servic\n network = var.network_self_link\n ip_address = google_compute_global_address.private_service_connect.id\n load_balancing_scheme = \"\"\n+\n+ dynamic \"service_directory_registrations\" {\n+ for_each = var.service_directory_namespace != null || var.service_directory_region != null ? [1] : []\n+\n+ content {\n+ namespace = var.service_directory_namespace\n+ service_directory_region = var.service_directory_region\n+ }\n+ }\n }\n---\nmodules/private-service-connect/variables.tf\n@@ -56,3 +56,15 @@ variable \"forwarding_rule_target\" {\n error_message = \"For forwarding_rule_target only `all-apis` and `vpc-sc` are valid.\"\n }\n }\n+\n+variable \"service_directory_namespace\" {\n+ description = \"Service Directory namespace to register the forwarding rule under.\"\n+ type = string\n+ default = null\n+}\n+\n+variable \"service_directory_region\" {\n+ description = \"Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined.\"\n+ type = string\n+ default = null\n+}\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.50, < 6\"\n+ version = \">= 5.8, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.50, < 6\"\n+ version = \">= 5.8, < 6\"\n }\n }\n \n---\n\n\n---\n\nChoice B:\ndocs/upgrading_to_v10.0.0.md\n@@ -0,0 +1,5 @@\n+# Upgrading to v10.0.0\n+\n+The v10.0 release contains backwards-incompatible changes.\n+\n+This update requires upgrading the minimum provider version of `hashicorp/google` from `3.50` to `5.8` and `hashicorp/google-beta` from `3.50` to `5.8`.\n---\nmodules/private-service-connect/README.md\n@@ -57,6 +57,8 @@ If you have a firewall rule blocking egress traffic, you will need to configure\n | private\\_service\\_connect\\_ip | The internal IP to be used for the private service connect. | `string` | n/a | yes |\n | private\\_service\\_connect\\_name | Private Service Connect endpoint name. Defaults to `global-psconnect-ip` | `string` | `\"global-psconnect-ip\"` | no |\n | project\\_id | Project ID for Private Service Connect. | `string` | n/a | yes |\n+| service\\_directory\\_namespace | Service Directory namespace to register the forwarding rule under. | `string` | `null` | no |\n+| service\\_directory\\_region | Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined. | `string` | `null` | no |\n \n ## Outputs\n \n---\nmodules/private-service-connect/main.tf\n@@ -38,4 +38,13 @@ resource \"google_compute_global_forwarding_rule\" \"forwarding_rule_private_servic\n network = var.network_self_link\n ip_address = google_compute_global_address.private_service_connect.id\n load_balancing_scheme = \"\"\n+\n+ dynamic \"service_directory_registrations\" {\n+ for_each = var.service_directory_namespace != null || var.service_directory_region != null ? [1] : []\n+\n+ content {\n+ namespace = var.service_directory_namespace\n+ service_directory_region = var.service_directory_region\n+ }\n+ }\n }\n---\nmodules/private-service-connect/variables.tf\n@@ -56,3 +56,15 @@ variable \"forwarding_rule_target\" {\n error_message = \"For forwarding_rule_target only `all-apis` and `vpc-sc` are valid.\"\n }\n }\n+\n+variable \"service_directory_namespace\" {\n+ description = \"Service Directory namespace to register the forwarding rule under.\"\n+ type = string\n+ default = null\n+}\n+\n+variable \"service_directory_region\" {\n+ description = \"Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined.\"\n+ type = null\n+}\n+\n+variable default = null\n+}\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.50, < 6\"\n+ version = \">= 5.8, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.50, < 6\"\n+ version = \">= 5.8, < 6\"\n }\n }\n \n---\n\n\n---\n\nChoice C:\ndocs/upgrading_to_v10.0.0.md\n@@ -0,0 Directory @@\n+# Upgrading to v10.0.0\n+\n+The v10.0 release contains backwards-incompatible changes.\n+\n+This update requires upgrading the minimum provider version of `hashicorp/google` from `3.50` to `5.8` and `hashicorp/google-beta` from `3.50` to `5.8`.\n---\nmodules/private-service-connect/README.md\n@@ -57,6 +57,8 @@ If you have a firewall rule blocking egress traffic, you will need to configure\n | private\\_service\\_connect\\_ip | The internal IP to be used for the private service connect. | `string` | n/a | yes |\n | private\\_service\\_connect\\_name | Private Service Connect endpoint name. Defaults to `global-psconnect-ip` | `string` | `\"global-psconnect-ip\"` | no |\n | project\\_id | Project ID for Private Service Connect. | `string` | n/a | yes |\n+| service\\_directory\\_namespace | Service Directory namespace to register the forwarding rule under. | `string` | `null` | no |\n+| service\\_directory\\_region | Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined. | `string` | `null` | no |\n \n ## Outputs\n \n---\nmodules/private-service-connect/main.tf\n@@ -38,4 +38,13 @@ resource \"google_compute_global_forwarding_rule\" \"forwarding_rule_private_servic\n network = var.network_self_link\n ip_address = google_compute_global_address.private_service_connect.id\n load_balancing_scheme = \"\"\n+\n+ dynamic \"service_directory_registrations\" {\n+ for_each = var.service_directory_namespace != null || var.service_directory_region != null ? [1] : []\n+\n+ content {\n+ namespace = var.service_directory_namespace\n+ service_directory_region = var.service_directory_region\n+ }\n+ }\n }\n---\nmodules/private-service-connect/variables.tf\n@@ -56,3 +56,15 @@ variable \"forwarding_rule_target\" {\n error_message = \"For forwarding_rule_target only `all-apis` and `vpc-sc` are valid.\"\n }\n }\n+\n+variable \"service_directory_namespace\" {\n+ description = \"Service Directory namespace to register the forwarding rule under.\"\n+ type = string\n+ default = null\n+}\n+\n+variable \"service_directory_region\" {\n+ description = \"Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined.\"\n+ type = string\n+ default = null\n+}\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.50, < 6\"\n+ version = \">= 5.8, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.50, < 6\"\n+ version = \">= 5.8, < 6\"\n }\n }\n \n---\n\n\n---\n\nChoice D:\ndocs/upgrading_to_v10.0.0.md\n@@ -0,0 +1,5 @@\n+# Upgrading to v10.0.0\n+\n+The v10.0 release contains backwards-incompatible changes.\n+\n+This update requires upgrading the minimum provider version of `hashicorp/google` from `3.50` to `5.8` and `hashicorp/google-beta` from `3.50` to `5.8`.\n---\nmodules/private-service-connect/README.md\n@@ -57,6 +57,8 @@ If you have a firewall rule blocking egress traffic, you will need to configure\n | private\\_service\\_connect\\_ip | The internal IP to be used for the private service connect. | `string` | n/a | yes |\n | private\\_service\\_connect\\_name | Private Service Connect endpoint name. Defaults to `global-psconnect-ip` | `string` | `\"global-psconnect-ip\"` | no |\n | project\\_id | Project ID for Private Service Connect. | `string` | n/a | yes |\n+| service\\_directory\\_namespace | Service Directory namespace to register the forwarding rule under. | `string` | `null` | no |\n+| service\\_directory\\_region {\n Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined. | `string` | `null` | no |\n \n ## Outputs\n \n---\nmodules/private-service-connect/main.tf\n@@ -38,4 +38,13 @@ resource \"google_compute_global_forwarding_rule\" \"forwarding_rule_private_servic\n network = var.network_self_link\n ip_address = google_compute_global_address.private_service_connect.id\n load_balancing_scheme = \"\"\n+\n+ dynamic \"service_directory_registrations\" {\n+ for_each = var.service_directory_namespace != null || var.service_directory_region != null ? [1] : []\n+\n+ content {\n+ namespace = var.service_directory_namespace\n+ service_directory_region = var.service_directory_region\n+ }\n+ }\n }\n---\nmodules/private-service-connect/variables.tf\n@@ -56,3 +56,15 @@ variable \"forwarding_rule_target\" {\n error_message = \"For forwarding_rule_target only `all-apis` and `vpc-sc` are valid.\"\n }\n }\n+\n+variable \"service_directory_namespace\" {\n+ description = \"Service Directory namespace to register the forwarding rule under.\"\n+ type = string\n+ default = null\n+}\n+\n+variable \"service_directory_region\" {\n+ description = \"Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined.\"\n+ type = string\n+ default = null\n+}\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.50, < 6\"\n+ version = \">= 5.8, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.50, < 6\"\n+ version = \">= 5.8, < 6\"\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 | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|---|---|\n| cft/developer-tools | | minor | `1.18` -> `1.19` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit) | require | minor | `v0.11.1` -> `v0.13.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n| [github.com/stretchr/testify](https://togithub.com/stretchr/testify) | require | minor | `v1.8.4` -> `v1.9.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n| [github.com/tidwall/gjson](https://togithub.com/tidwall/gjson) | require | patch | `v1.17.0` -> `v1.17.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>stretchr/testify (github.com/stretchr/testify)</summary>\n\n### [`v1.9.0`](https://togithub.com/stretchr/testify/releases/tag/v1.9.0)\n\n[Compare Source](https://togithub.com/stretchr/testify/compare/v1.8.4...v1.9.0)\n\n#### What's Changed\n\n- Fix Go modules version by [@​SuperQ](https://togithub.com/SuperQ) in [https://github.com/stretchr/testify/pull/1394](https://togithub.com/stretchr/testify/pull/1394)\n- Document that require is not safe to call in created goroutines by [@​programmer04](https://togithub.com/programmer04) in [https://github.com/stretchr/testify/pull/1392](https://togithub.com/stretchr/testify/pull/1392)\n- Remove myself from MAINTAINERS.md by [@​mvdkleijn](https://togithub.com/mvdkleijn) in [https://github.com/stretchr/testify/pull/1367](https://togithub.com/stretchr/testify/pull/1367)\n- Correct spelling/grammar by [@​echarrod](https://togithub.com/echarrod) in [https://github.com/stretchr/testify/pull/1389](https://togithub.com/stretchr/testify/pull/1389)\n- docs: Update URLs in README by [@​davidjb](https://togithub.com/davidjb) in [https://github.com/stretchr/testify/pull/1349](https://togithub.com/stretchr/testify/pull/1349)\n- Update mockery link to Github Pages in README by [@​LandonTClipp](https://togithub.com/LandonTClipp) in [https://github.com/stretchr/testify/pull/1346](https://togithub.com/stretchr/testify/pull/1346)\n- docs: Fix typos in tests and comments by [@​alexandear](https://togithub.com/alexandear) in [https://github.com/stretchr/testify/pull/1410](https://togithub.com/stretchr/testify/pull/1410)\n- CI: tests from go1.17 by [@​SuperQ](https://togithub.com/SuperQ) in [https://github.com/stretchr/testify/pull/1409](https://togithub.com/stretchr/testify/pull/1409)\n- Fix adding ? when no values passed by [@​lesichkovm](https://togithub.com/lesichkovm) in [https://github.com/stretchr/testify/pull/1320](https://togithub.com/stretchr/testify/pull/1320)\n- codegen: use standard header for generated files by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1406](https://togithub.com/stretchr/testify/pull/1406)\n- mock: AssertExpectations log reason only on failure by [@​hikyaru-suzuki](https://togithub.com/hikyaru-suzuki) in [https://github.com/stretchr/testify/pull/1360](https://togithub.com/stretchr/testify/pull/1360)\n- assert: fix flaky TestNeverTrue by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1417](https://togithub.com/stretchr/testify/pull/1417)\n- README: fix typos \"set up\" vs \"setup\" by [@​ossan-dev](https://togithub.com/ossan-dev) in [https://github.com/stretchr/testify/pull/1428](https://togithub.com/stretchr/testify/pull/1428)\n- mock: move regexp compilation outside of `Called` by [@​aud10slave](https://togithub.com/aud10slave) in [https://github.com/stretchr/testify/pull/631](https://togithub.com/stretchr/testify/pull/631)\n- assert: refactor internal func getLen() by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1445](https://togithub.com/stretchr/testify/pull/1445)\n- mock: deprecate type AnythingOfTypeArgument ([#​1434](https://togithub.com/stretchr/testify/issues/1434)) by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1441](https://togithub.com/stretchr/testify/pull/1441)\n- Remove no longer needed assert.canConvert by [@​alexandear](https://togithub.com/alexandear) in [https://github.com/stretchr/testify/pull/1470](https://togithub.com/stretchr/testify/pull/1470)\n- assert: ObjectsAreEqual: use time.Equal for time.Time types by [@​tscales](https://togithub.com/tscales) in [https://github.com/stretchr/testify/pull/1464](https://togithub.com/stretchr/testify/pull/1464)\n- Bump actions/checkout from 3 to 4 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/stretchr/testify/pull/1466](https://togithub.com/stretchr/testify/pull/1466)\n- Bump actions/setup-go from 3.2.0 to 4.1.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/stretchr/testify/pull/1451](https://togithub.com/stretchr/testify/pull/1451)\n- fix: make EventuallyWithT concurrency safe by [@​czeslavo](https://togithub.com/czeslavo) in [https://github.com/stretchr/testify/pull/1395](https://togithub.com/stretchr/testify/pull/1395)\n- assert: fix httpCode and HTTPBody occur panic when http.Handler read Body by [@​hidu](https://togithub.com/hidu) in [https://github.com/stretchr/testify/pull/1484](https://togithub.com/stretchr/testify/pull/1484)\n- assert.EqualExportedValues: fix handling of arrays by [@​zrbecker](https://togithub.com/zrbecker) in [https://github.com/stretchr/testify/pull/1473](https://togithub.com/stretchr/testify/pull/1473)\n- .github: use latest Go versions by [@​kevinburkesegment](https://togithub.com/kevinburkesegment) in [https://github.com/stretchr/testify/pull/1489](https://togithub.com/stretchr/testify/pull/1489)\n- assert: Deprecate EqualExportedValues by [@​HaraldNordgren](https://togithub.com/HaraldNordgren) in [https://github.com/stretchr/testify/pull/1488](https://togithub.com/stretchr/testify/pull/1488)\n- suite: refactor test assertions by [@​alexandear](https://togithub.com/alexandear) in [https://github.com/stretchr/testify/pull/1474](https://togithub.com/stretchr/testify/pull/1474)\n- suite: fix SetupSubTest and TearDownSubTest execution order by [@​linusbarth](https://togithub.com/linusbarth) in [https://github.com/stretchr/testify/pull/1471](https://togithub.com/stretchr/testify/pull/1471)\n- docs: Fix deprecation comments for http package by [@​alexandear](https://togithub.com/alexandear) in [https://github.com/stretchr/testify/pull/1335](https://togithub.com/stretchr/testify/pull/1335)\n- Add map support doc comments to Subset and NotSubset by [@​jedevc](https://togithub.com/jedevc) in [https://github.com/stretchr/testify/pull/1306](https://togithub.com/stretchr/testify/pull/1306)\n- TestErrorIs/TestNotErrorIs: check error message contents by [@​craig65535](https://togithub.com/craig65535) in [https://github.com/stretchr/testify/pull/1435](https://togithub.com/stretchr/testify/pull/1435)\n- suite: fix subtest names (fix [#​1501](https://togithub.com/stretchr/testify/issues/1501)) by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1504](https://togithub.com/stretchr/testify/pull/1504)\n- assert: improve unsafe.Pointer tests by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1505](https://togithub.com/stretchr/testify/pull/1505)\n- assert: simplify isNil implementation by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1506](https://togithub.com/stretchr/testify/pull/1506)\n- assert.InEpsilonSlice: fix expected/actual order and other improvements by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1483](https://togithub.com/stretchr/testify/pull/1483)\n- Fix dependency cycle with objx [#​1292](https://togithub.com/stretchr/testify/issues/1292) by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1453](https://togithub.com/stretchr/testify/pull/1453)\n- mock: refactor TestIsArgsEqual by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1444](https://togithub.com/stretchr/testify/pull/1444)\n- mock: optimize argument matching checks by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1416](https://togithub.com/stretchr/testify/pull/1416)\n- assert: fix TestEventuallyTimeout by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1412](https://togithub.com/stretchr/testify/pull/1412)\n- CI: add go 1.21 in GitHub Actions by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1450](https://togithub.com/stretchr/testify/pull/1450)\n- suite: fix recoverAndFailOnPanic to report test failure at the right location by [@​dolmen](https://togithub.com/dolmen) in [https://github.com/stretchr/testify/pull/1502](https://togithub.com/stretchr/testify/pull/1502)\n- Update maintainers by [@​brackendawson](https://togithub.com/brackendawson) in [https://github.com/stretchr/testify/pull/1533](https://togithub.com/stretchr/testify/pull/1533)\n- assert: Fix EqualValues to handle overflow/underflow by [@​arjunmahishi](https://togithub.com/arjunmahishi) in [https://github.com/stretchr/testify/pull/1531](https://togithub.com/stretchr/testify/pull/1531)\n- assert: better formatting for Len() error by [@​kevinburkesegment](https://togithub.com/kevinburkesegment) in [https://github.com/stretchr/testify/pull/1485](https://togithub.com/stretchr/testify/pull/1485)\n- Ensure AssertExpectations does not fail in skipped tests by [@​ianrose14](https://togithub.com/ianrose14) in [https://github.com/stretchr/testify/pull/1331](https://togithub.com/stretchr/testify/pull/1331)\n- suite: fix deadlock in suite.Require()/Assert() by [@​arjunmahishi](https://togithub.com/arjunmahishi) in [https://github.com/stretchr/testify/pull/1535](https://togithub.com/stretchr/testify/pull/1535)\n- Revert \"assert: ObjectsAreEqual: use time.Equal for time.Time type\" by [@​brackendawson](https://togithub.com/brackendawson) in [https://github.com/stretchr/testify/pull/1537](https://togithub.com/stretchr/testify/pull/1537)\n- \\[chore] Add issue templates by [@​arjunmahishi](https://togithub.com/arjunmahishi) in [https://github.com/stretchr/testify/pull/1538](https://togithub.com/stretchr/testify/pull/1538)\n- Update the build status badge by [@​brackendawson](https://togithub.com/brackendawson) in [https://github.com/stretchr/testify/pull/1540](https://togithub.com/stretchr/testify/pull/1540)\n- Update Github workflows setup-go to V5 by [@​hendrywiranto](https://togithub.com/hendrywiranto) in [https://github.com/stretchr/testify/pull/1545](https://togithub.com/stretchr/testify/pull/1545)\n- Support Pointer to Struct in EqualExportedValues by [@​Lucaber](https://togithub.com/Lucaber) in [https://github.com/stretchr/testify/pull/1517](https://togithub.com/stretchr/testify/pull/1517)\n- README: drop link to gorc by [@​guettli](https://togithub.com/guettli) in [https://github.com/stretchr/testify/pull/1248](https://togithub.com/stretchr/testify/pull/1248)\n- http_assertions: honour the msgAndArgs provided with each assertion by [@​arjunmahishi](https://togithub.com/arjunmahishi) in [https://github.com/stretchr/testify/pull/1548](https://togithub.com/stretchr/testify/pull/1548)\n- fix typos in comments and tests by [@​ccoVeille](https://togithub.com/ccoVeille) in [https://github.com/stretchr/testify/pull/1247](https://togithub.com/stretchr/testify/pull/1247)\n- Include the auto-release notes in releases by [@​brackendawson](https://togithub.com/brackendawson) in [https://github.com/stretchr/testify/pull/1550](https://togithub.com/stretchr/testify/pull/1550)\n- Add `NotImplements` and variants by [@​hslatman](https://togithub.com/hslatman) in [https://github.com/stretchr/testify/pull/1385](https://togithub.com/stretchr/testify/pull/1385)\n- Add support to compare uintptr by [@​bogdandrutu](https://togithub.com/bogdandrutu) in [https://github.com/stretchr/testify/pull/1339](https://togithub.com/stretchr/testify/pull/1339)\n- build(deps): bump github.com/stretchr/objx from 0.5.1 to 0.5.2 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/stretchr/testify/pull/1552](https://togithub.com/stretchr/testify/pull/1552)\n\n#### New Contributors\n\n- [@​SuperQ](https://togithub.com/SuperQ) made their first contribution in [https://github.com/stretchr/testify/pull/1394](https://togithub.com/stretchr/testify/pull/1394)\n- [@​programmer04](https://togithub.com/programmer04) made their first contribution in [https://github.com/stretchr/testify/pull/1392](https://togithub.com/stretchr/testify/pull/1392)\n- [@​echarrod](https://togithub.com/echarrod) made their first contribution in [https://github.com/stretchr/testify/pull/1389](https://togithub.com/stretchr/testify/pull/1389)\n- [@​davidjb](https://togithub.com/davidjb) made their first contribution in [https://github.com/stretchr/testify/pull/1349](https://togithub.com/stretchr/testify/pull/1349)\n- [@​LandonTClipp](https://togithub.com/LandonTClipp) made their first contribution in [https://github.com/stretchr/testify/pull/1346](https://togithub.com/stretchr/testify/pull/1346)\n- [@​alexandear](https://togithub.com/alexandear) made their first contribution in [https://github.com/stretchr/testify/pull/1410](https://togithub.com/stretchr/testify/pull/1410)\n- [@​lesichkovm](https://togithub.com/lesichkovm) made their first contribution in [https://github.com/stretchr/testify/pull/1320](https://togithub.com/stretchr/testify/pull/1320)\n- [@​dolmen](https://togithub.com/dolmen) made their first contribution in [https://github.com/stretchr/testify/pull/1406](https://togithub.com/stretchr/testify/pull/1406)\n- [@​hikyaru-suzuki](https://togithub.com/hikyaru-suzuki) made their first contribution in [https://github.com/stretchr/testify/pull/1360](https://togithub.com/stretchr/testify/pull/1360)\n- [@​ossan-dev](https://togithub.com/ossan-dev) made their first contribution in [https://github.com/stretchr/testify/pull/1428](https://togithub.com/stretchr/testify/pull/1428)\n- [@​aud10slave](https://togithub.com/aud10slave) made their first contribution in [https://github.com/stretchr/testify/pull/631](https://togithub.com/stretchr/testify/pull/631)\n- [@​tscales](https://togithub.com/tscales) made their first contribution in [https://github.com/stretchr/testify/pull/1464](https://togithub.com/stretchr/testify/pull/1464)\n- [@​czeslavo](https://togithub.com/czeslavo) made their first contribution in [https://github.com/stretchr/testify/pull/1395](https://togithub.com/stretchr/testify/pull/1395)\n- [@​hidu](https://togithub.com/hidu) made their first contribution in [https://github.com/stretchr/testify/pull/1484](https://togithub.com/stretchr/testify/pull/1484)\n- [@​zrbecker](https://togithub.com/zrbecker) made their first contribution in [https://github.com/stretchr/testify/pull/1473](https://togithub.com/stretchr/testify/pull/1473)\n- [@​kevinburkesegment](https://togithub.com/kevinburkesegment) made their first contribution in [https://github.com/stretchr/testify/pull/1489](https://togithub.com/stretchr/testify/pull/1489)\n- [@​linusbarth](https://togithub.com/linusbarth) made their first contribution in [https://github.com/stretchr/testify/pull/1471](https://togithub.com/stretchr/testify/pull/1471)\n- [@​jedevc](https://togithub.com/jedevc) made their first contribution in [https://github.com/stretchr/testify/pull/1306](https://togithub.com/stretchr/testify/pull/1306)\n- [@​craig65535](https://togithub.com/craig65535) made their first contribution in [https://github.com/stretchr/testify/pull/1435](https://togithub.com/stretchr/testify/pull/1435)\n- [@​arjunmahishi](https://togithub.com/arjunmahishi) made their first contribution in [https://github.com/stretchr/testify/pull/1531](https://togithub.com/stretchr/testify/pull/1531)\n- [@​ianrose14](https://togithub.com/ianrose14) made their first contribution in [https://github.com/stretchr/testify/pull/1331](https://togithub.com/stretchr/testify/pull/1331)\n- [@​hendrywiranto](https://togithub.com/hendrywiranto) made their first contribution in [https://github.com/stretchr/testify/pull/1545](https://togithub.com/stretchr/testify/pull/1545)\n- [@​Lucaber](https://togithub.com/Lucaber) made their first contribution in [https://github.com/stretchr/testify/pull/1517](https://togithub.com/stretchr/testify/pull/1517)\n- [@​guettli](https://togithub.com/guettli) made their first contribution in [https://github.com/stretchr/testify/pull/1248](https://togithub.com/stretchr/testify/pull/1248)\n- [@​ccoVeille](https://togithub.com/ccoVeille) made their first contribution in [https://github.com/stretchr/testify/pull/1247](https://togithub.com/stretchr/testify/pull/1247)\n- [@​hslatman](https://togithub.com/hslatman) made their first contribution in [https://github.com/stretchr/testify/pull/1385](https://togithub.com/stretchr/testify/pull/1385)\n- [@​bogdandrutu](https://togithub.com/bogdandrutu) made their first contribution in [https://github.com/stretchr/testify/pull/1339](https://togithub.com/stretchr/testify/pull/1339)\n\n**Full Changelog**: https://github.com/stretchr/testify/compare/v1.8.4...v1.9.0\n\n</details>\n\n<details>\n<summary>tidwall/gjson (github.com/tidwall/gjson)</summary>\n\n### [`v1.17.1`](https://togithub.com/tidwall/gjson/compare/v1.17.0...v1.17.1)\n\n[Compare Source](https://togithub.com/tidwall/gjson/compare/v1.17.0...v1.17.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👻 **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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNTMuMiIsInVwZGF0ZWRJblZlciI6IjM3LjIzMC4wIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->\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.18\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.19\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\n---\ntest/integration/go.mod\n@@ -3,10 +3,10 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0\n \tgithub.com/gruntwork-io/terratest v0.46.11\n-\tgithub.com/stretchr/testify v1.8.4\n-\tgithub.com/tidwall/gjson v1.17.0\n+\tgithub.com/stretchr/testify v1.9.0\n+\tgithub.com/tidwall/gjson v1.17.1\n )\n \n require (\n@@ -16,6 +16,7 @@ require (\n \tcloud.google.com/go/iam v1.1.2 // indirect\n \tcloud.google.com/go/storage v1.33.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n+\tgithub.com/alexflint/go-filemutex v1.3.0 // indirect\n \tgithub.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect\n \tgithub.com/aws/aws-sdk-go v1.45.5 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n@@ -61,11 +62,11 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.17.0 // indirect\n-\tgolang.org/x/mod v0.14.0 // indirect\n+\tgolang.org/x/mod v0.15.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n _DOCKER_IMAGE_DEVELOPER_TOOLS: v0.4.0 // indirect\n-\tgolang.org/x/sys v0.15.0 // indirect\n+\tgolang.org/x/sys v0.16.0 // indirect\n \tgolang.org/x/text v0.14.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n---\ntest/integration/go.sum\n@@ -189,9 +189,13 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03\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.11.1 h1:S4Y7o5RKRC9Bk71VszCx9NeheWjdSAn5ejPuD1W6lNE=\n github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1/go.mod h1:v4TFK9TmX4mYyXL3v9wFXVN3A5vrt2LaVDBX2/OVU7Y=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0 h1:vZMVSILlQW/C1wF8w4jiQO5N98kBUiSsGcJAkcA2EFg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0/go.mod h1:iipeDC0VhxKtIVOZyz0ofiJ2x6sh9+VYEbG3JKsPqPw=\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+github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n+github.com/alexflint/go-filemutex v1.3.0/go.mod h1:U0+VA/i30mGBlLCrFPGtTe9y6wGQfNAWPBTekHQ+c8A=\n github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=\n github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=\n github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=\n@@ -439,9 +443,13 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=\n github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=\n+github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=\n@@ -518,6 +526,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=\n golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n+golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=\n+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n@@ -675,6 +685,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc\n golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=\n golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=\n+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n---\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.18\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.19\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\n---\ntest/integration/go.mod\n@@ -3,10 +3,10 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0\n \tgithub.com/gruntwork-io/terratest v0.46.11\n-\tgithub.com/stretchr/testify v1.8.4\n-\tgithub.com/tidwall/gjson v1.17.0\n+\tgithub.com/stretchr/testify v1.9.0\n+\tgithub.com/tidwall/gjson v1.17.1\n )\n indirect\n require (\n@@ -16,6 +16,7 @@ require (\n \tcloud.google.com/go/iam v1.1.2 // indirect\n \tcloud.google.com/go/storage v1.33.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n+\tgithub.com/alexflint/go-filemutex v1.3.0 // indirect\n \tgithub.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect\n \tgithub.com/aws/aws-sdk-go v1.45.5 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n@@ -61,11 +62,11 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.17.0 // indirect\n-\tgolang.org/x/mod v0.14.0 // indirect\n+\tgolang.org/x/mod v0.15.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.4.0 // indirect\n-\tgolang.org/x/sys v0.15.0 // indirect\n+\tgolang.org/x/sys v0.16.0 // indirect\n \tgolang.org/x/text v0.14.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n---\ntest/integration/go.sum\n@@ -189,9 +189,13 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03\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.11.1 h1:S4Y7o5RKRC9Bk71VszCx9NeheWjdSAn5ejPuD1W6lNE=\n github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1/go.mod h1:v4TFK9TmX4mYyXL3v9wFXVN3A5vrt2LaVDBX2/OVU7Y=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0 h1:vZMVSILlQW/C1wF8w4jiQO5N98kBUiSsGcJAkcA2EFg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0/go.mod h1:iipeDC0VhxKtIVOZyz0ofiJ2x6sh9+VYEbG3JKsPqPw=\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+github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n+github.com/alexflint/go-filemutex v1.3.0/go.mod h1:U0+VA/i30mGBlLCrFPGtTe9y6wGQfNAWPBTekHQ+c8A=\n github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=\n github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=\n github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=\n@@ -439,9 +443,13 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=\n github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=\n+github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=\n@@ -518,6 +526,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=\n golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n+golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=\n+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n@@ -675,6 +685,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc\n golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=\n golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=\n+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n---\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.18\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.19\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\n---\ntest/integration/go.mod\n@@ -3,10 +3,10 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0\n \tgithub.com/gruntwork-io/terratest v0.46.11\n-\tgithub.com/stretchr/testify v1.8.4\n-\tgithub.com/tidwall/gjson v1.17.0\n+\tgithub.com/stretchr/testify v1.9.0\n+\tgithub.com/tidwall/gjson v1.17.1\n )\n \n require (\n@@ -16,6 +16,7 @@ require (\n \tcloud.google.com/go/iam v1.1.2 // indirect\n \tcloud.google.com/go/storage v1.33.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n+\tgithub.com/alexflint/go-filemutex v1.3.0 // indirect\n \tgithub.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect\n \tgithub.com/aws/aws-sdk-go v1.45.5 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n@@ -61,11 +62,11 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.17.0 // indirect\n-\tgolang.org/x/mod v0.14.0 // indirect\n+\tgolang.org/x/mod v0.15.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.4.0 // indirect\n-\tgolang.org/x/sys v0.15.0 // indirect\n+\tgolang.org/x/sys v0.16.0 // indirect\n \tgolang.org/x/text v0.14.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n---\ntest/integration/go.sum\n@@ -189,9 +189,13 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03\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.11.1 h1:S4Y7o5RKRC9Bk71VszCx9NeheWjdSAn5ejPuD1W6lNE=\n github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1/go.mod h1:v4TFK9TmX4mYyXL3v9wFXVN3A5vrt2LaVDBX2/OVU7Y=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0 h1:vZMVSILlQW/C1wF8w4jiQO5N98kBUiSsGcJAkcA2EFg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0/go.mod h1:iipeDC0VhxKtIVOZyz0ofiJ2x6sh9+VYEbG3JKsPqPw=\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+github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n+github.com/alexflint/go-filemutex v1.3.0/go.mod h1:U0+VA/i30mGBlLCrFPGtTe9y6wGQfNAWPBTekHQ+c8A=\n github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=\n github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=\n github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=\n@@ -439,9 +443,13 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=\n github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=\n+github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=\n@@ -518,6 +526,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=\n golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n+golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=\n+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n@@ -675,6 +685,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc\n golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=\n golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=\n+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n---\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.18\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.19\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\n---\ntest/integration/go.mod\n@@ -3,10 +3,10 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0\n \tgithub.com/gruntwork-io/terratest v0.46.11\n-\tgithub.com/stretchr/testify v1.8.4\n-\tgithub.com/tidwall/gjson v1.17.0\n+\tgithub.com/stretchr/testify v1.9.0\n+\tgithub.com/tidwall/gjson v1.17.1\n )\n \n require (\n@@ -16,6 +16,7 @@ require (\n \tcloud.google.com/go/iam v1.1.2 // indirect\n \tcloud.google.com/go/storage v1.33.0 // indirect\n \tgithub.com/agext/levenshtein v1.2.3 // indirect\n+\tgithub.com/alexflint/go-filemutex v1.3.0 // indirect\n \tgithub.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect\n \tgithub.com/aws/aws-sdk-go v1.45.5 // indirect\n \tgithub.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect\n@@ -61,11 +62,11 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.17.0 // indirect\n-\tgolang.org/x/mod v0.14.0 // indirect\n+\tgolang.org/x/mod v0.15.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v0.4.0 // indirect\n-\tgolang.org/x/sys v0.15.0 // indirect\n+\tgolang.org/x/sys v0.16.0 // indirect\n \tgolang.org/x/text v0.14.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n---\ntest/integration/go.sum\n@@ -189,9 +189,13 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03\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.11.1 h1:S4Y7o5RKRC9Bk71VszCx9NeheWjdSAn5ejPuD1W6lNE=\n github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1/go.mod h1:v4TFK9TmX4mYyXL3v9wFXVN3A5vrt2LaVDBX2/OVU7Y=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0 h1:vZMVSILlQW/C1wF8w4jiQO5N98kBUiSsGcJAkcA2EFg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.13.0/go.mod h1:iipeDC0VhxKtIVOZyz0ofiJ2x6sh9+VYEbG3JKsPqPw=\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+github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=\n+github.com/alexflint/go-filemutex v1.3.0/go.mod h1:U0+VA/i30mGBlLCrFPGtTe9y6wGQfNAWPBTekHQ+c8A=\n github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=\n github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=\n github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=\n@@ -439,9 +443,13 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=\n github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=\n+github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=\n@@ -518,6 +526,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=\n golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n+golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=\n+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n@@ -675,6 +685,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc\n golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=\n golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=\n+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n---\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:\nexamples/simple_project/main.tf\n@@ -23,9 +23,9 @@\n # [START vpc_custom_create]\n \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.0\"\n+ version = \"2.6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n- network_name = \"my-custom-mode-network\"\n+ network_name = \"my-custom-mode-network-update-suffix\"\n mtu = 1460\n \n subnets = [\n---\n\n\n---\n\nChoice B:\nexamples/simple_project/main.tf\n@@ -23,9 +23,9 @@\n # [START vpc_custom_create]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.0\"\n+ version = \"2.6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n- network_name = \"my-custom-mode-network\"\n+ network_name = \"my-custom-mode-network-update-suffix\"\n mtu = 1460\n \n subnets = [\n---\n\n\n---\n\nChoice C:\nexamples/simple_project/main.tf\n@@ -23,9 +23,9 @@\n # [START vpc_custom_create]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.0\"\n+ version = \"2.6.0\"\n project_id = var.project_id # Replace this with project ID in quotes\n- network_name = \"my-custom-mode-network\"\n+ network_name = \"my-custom-mode-network-update-suffix\"\n mtu = 1460\n \n subnets = [\n---\n\n\n---\n\nChoice D:\nexamples/simple_project/main.tf\n@@ -23,9 +23,9 @@\n # [START vpc_custom_create]\n module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n- version = \"~> 9.0\"\n+ version = \"2.6.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n- network_name = \"my-custom-mode-network\"\n+ network_name = \"my-custom-mode-network-update-suffix\"\n mtu = 1460\n \n Replace = [\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.18` -> `1.19` |\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNTMuMiIsInVwZGF0ZWRJblZlciI6IjM3LjE1My4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->\n\n\n---\n\nChoice A:\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- '1.19'\n---\nbuild/lint.cloudbuild.yaml\n@@ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\n---\n\n\n---\n\nChoice B:\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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: +216,4 _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\n---\n\n\n---\n\nChoice C:\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\n---\n\n\n---\n\nChoice D:\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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 | Update | Change |\n|---|---|---|\n| cft/developer-tools | minor | `1.18` -> `1.19` |\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNTMuMiIsInVwZGF0ZWRJblZlciI6IjM3LjE1My4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->\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.18\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.19\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- := '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\n---\n\n\n---\n\nChoice B:\nMake -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.18\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.19\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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.18\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.19\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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.18\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.19\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - 'lint'\n 'integration'\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'\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 | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | `v0.46.8` -> `v0.46.11` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.46.11`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.11)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.46.10...v0.46.11)\n\n##### Modules affected\n\n- `aws`\n\n##### Description\n\n- Updated `GetAmazonLinuxAmiE` to search for Amazon Linux 2 AMIs\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/1387](https://togithub.com/gruntwork-io/terratest/pull/1387)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.46.10`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.10)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.46.9...v0.46.10)\n\n#### Modules affected\n\n- `test-structure`\n- `git`\n\n#### Description\n\n- Updated `runValidateOnAllTerraformModules` function, which is used under the hood by `ValidateAllTerraformModules` and `OPAEvalAllTerraformModules`, to:\n\n1. Find the Git root using `git.GetRepoRootForDirE`, instead of a hard-coded `../../` file path.\n2. Copy the Git root to a temp folder once, rather than once per sub-test.\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/1376](https://togithub.com/gruntwork-io/terratest/pull/1376)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.46.9`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.9)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.46.8...v0.46.9)\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- `helm`\n\n#### Description\n\n- Added support in Helm for snapshot testing, similar to [helm-unittest](https://togithub.com/helm-unittest/helm-unittest) feature [snapshot testing](https://togithub.com/helm-unittest/helm-unittest#snapshot-testing).\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- [@​jguionnet](https://togithub.com/jguionnet)\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/1378](https://togithub.com/gruntwork-io/terratest/pull/1378)\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMjcuMCIsInVwZGF0ZWRJblZlciI6IjM3LjEzNS4wIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.21\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1\n-\tgithub.com/gruntwork-io/terratest v0.46.8\n+\tgithub.com/gruntwork-io/terratest v0.46.11\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n@@ -64,7 +64,7 @@ require (\n \tgolang.org/x/mod v0.14.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n-\tgolang.org/x/sync v0.3.0 // indirect\n+\tgolang.org/x/sync v0.4.0 // indirect\n \tgolang.org/x/sys v0.15.0 // indirect\n \tgolang.org/x/text v0.14.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n---\ntest/integration/go.sum\n@@ -351,8 +351,8 @@ github.com/googleapis/gax-go/v2 v0.46.11\n h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.8 h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n-github.com/gruntwork-io/terratest v0.46.8/go.mod h1:6MxfmOFQQEpQZjpuWRwuAK8qm836hYgAOCzSIZIWTmg=\n+github.com/gruntwork-io/terratest v0.46.11 h1:1Z9G18I2FNuH87Ro0YtjW4NH9ky4GDpfzE7+ivkPeB8=\n+github.com/gruntwork-io/terratest v0.46.11/go.mod h1:DVZG/s7eP1u3KOQJJfE6n7FDriMWpDvnj85XIlZMEM8=\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@@ -424,8 +424,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L\n github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=\n github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=\n github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=\n-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=\n-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=\n+github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=\n+github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=\n github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=\n github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=\n github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=\n@@ -608,8 +608,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ\n golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=\n-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=\n+golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=\n+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=\n golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.21\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1\n-\tgithub.com/gruntwork-io/terratest v0.46.8\n+\tgithub.com/gruntwork-io/terratest v0.46.11\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n@@ -64,7 +64,7 @@ require (\n \tgolang.org/x/mod v0.14.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n-\tgolang.org/x/sync v0.3.0 // indirect\n+\tgolang.org/x/sync v0.4.0 // indirect\n \tgolang.org/x/sys v0.15.0 // indirect\n \tgolang.org/x/text v0.14.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n---\ntest/integration/go.sum\n@@ -351,8 +351,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.8 h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n-github.com/gruntwork-io/terratest v0.46.8/go.mod h1:6MxfmOFQQEpQZjpuWRwuAK8qm836hYgAOCzSIZIWTmg=\n+github.com/gruntwork-io/terratest v0.46.11 h1:1Z9G18I2FNuH87Ro0YtjW4NH9ky4GDpfzE7+ivkPeB8=\n+github.com/gruntwork-io/terratest v0.46.11/go.mod h1:DVZG/s7eP1u3KOQJJfE6n7FDriMWpDvnj85XIlZMEM8=\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@@ -424,8 +424,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L\n github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=\n github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=\n github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=\n-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=\n-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=\n+github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=\n+github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=\n github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=\n github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=\n github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=\n@@ -608,8 +608,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ\n golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=\n-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=\n+golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=\n+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=\n golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.21\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1\n-\tgithub.com/gruntwork-io/terratest v0.46.8\n+\tgithub.com/gruntwork-io/terratest v0.46.11\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n@@ -64,7 +64,7 @@ require (\n \tgolang.org/x/mod v0.14.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n-\tgolang.org/x/sync v0.3.0 // indirect\n+\tgolang.org/x/sync v0.4.0 // // \tgolang.org/x/sys v0.15.0 // indirect\n \tgolang.org/x/text v0.14.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n---\ntest/integration/go.sum\n@@ -351,8 +351,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.8 h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n-github.com/gruntwork-io/terratest v0.46.8/go.mod h1:6MxfmOFQQEpQZjpuWRwuAK8qm836hYgAOCzSIZIWTmg=\n+github.com/gruntwork-io/terratest v0.46.11 h1:1Z9G18I2FNuH87Ro0YtjW4NH9ky4GDpfzE7+ivkPeB8=\n+github.com/gruntwork-io/terratest v0.46.11/go.mod h1:DVZG/s7eP1u3KOQJJfE6n7FDriMWpDvnj85XIlZMEM8=\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@@ -424,8 +424,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L\n github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=\n github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=\n github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=\n-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=\n-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=\n+github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=\n+github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=\n github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=\n github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=\n github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=\n@@ -608,8 +608,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ\n golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=\n-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=\n+golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=\n+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=\n golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.21\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1\n-\tgithub.com/gruntwork-io/terratest v0.46.8\n+\tgithub.com/gruntwork-io/terratest v0.46.11\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n@@ -64,7 +64,7 @@ require (\n \tgolang.org/x/mod v0.14.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n-\tgolang.org/x/sync v0.3.0 // indirect\n+\tgolang.org/x/sync v0.4.0 h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L\n indirect\n \tgolang.org/x/sys v0.15.0 // indirect\n \tgolang.org/x/text v0.14.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n---\ntest/integration/go.sum\n@@ -351,8 +351,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.8 h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n-github.com/gruntwork-io/terratest v0.46.8/go.mod h1:6MxfmOFQQEpQZjpuWRwuAK8qm836hYgAOCzSIZIWTmg=\n+github.com/gruntwork-io/terratest v0.46.11 h1:1Z9G18I2FNuH87Ro0YtjW4NH9ky4GDpfzE7+ivkPeB8=\n+github.com/gruntwork-io/terratest v0.46.11/go.mod h1:DVZG/s7eP1u3KOQJJfE6n7FDriMWpDvnj85XIlZMEM8=\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@@ -424,8 +424,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L\n github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=\n github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=\n github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=\n-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=\n-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=\n+github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=\n+github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=\n github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=\n github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=\n github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=\n@@ -608,8 +608,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ\n golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=\n-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=\n-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=\n+golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=\n+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=\n golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=\n golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=\n---\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:\nRemoved provider in main.tf and changed provider in versions.tf\n\n---\n\nChoice A:\nexamples/private_service_connect_google_apis/main.tf\n@@ -16,14 +16,12 @@\n \n # [START vpc_subnet_private_access]\n resource \"google_compute_network\" \"network\" {\n- provider = google-beta\n project = var.project # Replace this with your project ID in quotes\n name = \"tf-test\"\n auto_create_subnetworks = false\n }\n \n resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"test-subnetwork\"\n ip_cidr_range = \"10.2.0.0/16\"\n@@ -35,7 +33,6 @@ resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n \n # [START compute_internal_ip_private_access]\n resource \"google_compute_global_address\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n = name = \"global-psconnect-ip\"\n address_type = \"INTERNAL\"\n@@ -47,7 +44,6 @@ resource \"google_compute_global_address\" \"default\" {\n \n # [START compute_forwarding_rule_private_access]\n resource \"google_compute_global_forwarding_rule\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"globalrule\"\n target = \"all-apis\"\n---\nexamples/private_service_connect_google_apis/versions.tf\n@@ -18,8 +18,8 @@ terraform {\n required_version = \">=0.12.6\"\n \n required_providers {\n- google-beta = {\n- source = \"hashicorp/google-beta\"\n+ google = {\n+ source = \"hashicorp/google\"\n }\n }\n }\n---\n\n\n---\n\nChoice B:\nexamples/private_service_connect_google_apis/main.tf\n@@ -16,14 +16,12 @@\n \n # [START vpc_subnet_private_access]\n resource \"google_compute_network\" \"network\" {\n- provider = google-beta\n project = var.project # Replace this with your project ID in quotes\n name = \"tf-test\"\n auto_create_subnetworks = }\n \n resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"test-subnetwork\"\n ip_cidr_range = \"10.2.0.0/16\"\n@@ -35,7 +33,6 @@ resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n \n # [START compute_internal_ip_private_access]\n resource \"google_compute_global_address\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"global-psconnect-ip\"\n address_type = \"INTERNAL\"\n@@ -47,7 +44,6 @@ resource \"google_compute_global_address\" \"default\" {\n \n # [START compute_forwarding_rule_private_access]\n resource \"google_compute_global_forwarding_rule\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"globalrule\"\n target = \"all-apis\"\n---\nexamples/private_service_connect_google_apis/versions.tf\n@@ -18,8 +18,8 @@ terraform {\n required_version = \">=0.12.6\"\n \n required_providers {\n- google-beta = {\n- source = \"hashicorp/google-beta\"\n+ google = {\n+ source = \"hashicorp/google\"\n }\n }\n }\n---\n\n\n---\n\nChoice C:\nexamples/private_service_connect_google_apis/main.tf\n@@ -16,14 +16,12 @@\n \n # [START vpc_subnet_private_access]\n resource \"google_compute_network\" \"network\" {\n- provider = google-beta\n project = var.project # Replace this with your project ID in quotes\n name = \"tf-test\"\n auto_create_subnetworks = false\n }\n \n resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"test-subnetwork\"\n ip_cidr_range = \"10.2.0.0/16\"\n@@ -35,7 +33,6 @@ resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n \n # [START compute_internal_ip_private_access]\n resource \"google_compute_global_address\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"global-psconnect-ip\"\n address_type = \"INTERNAL\"\n@@ -47,7 +44,6 @@ resource \"google_compute_global_address\" \"default\" {\n \n # [START compute_forwarding_rule_private_access]\n resource \"google_compute_global_forwarding_rule\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"globalrule\"\n target = \"all-apis\"\n---\nexamples/private_service_connect_google_apis/versions.tf\n@@ -18,8 +18,8 @@ terraform {\n required_version google-beta\n \">=0.12.6\"\n \n required_providers {\n- google-beta = {\n- source = \"hashicorp/google-beta\"\n+ google = {\n+ source = \"hashicorp/google\"\n }\n }\n }\n---\n\n\n---\n\nChoice D:\nexamples/private_service_connect_google_apis/main.tf\n@@ -16,14 +16,12 @@\n \n # [START vpc_subnet_private_access]\n resource \"google_compute_network\" \"network\" {\n- provider = google-beta\n project = var.project # Replace this with your project ID in quotes\n name = \"tf-test\"\n auto_create_subnetworks = false\n }\n \n resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"test-subnetwork\"\n ip_cidr_range = \"10.2.0.0/16\"\n@@ -35,7 +33,6 @@ resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n \n # [START compute_internal_ip_private_access]\n resource \"google_compute_global_address\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"global-psconnect-ip\"\n address_type = \"INTERNAL\"\n@@ -47,7 +44,6 @@ resource \"google_compute_global_address\" \"default\" {\n \n # [START compute_forwarding_rule_private_access]\n resource \"google_compute_global_forwarding_rule\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"globalrule\"\n target = \"all-apis\"\n---\nexamples/private_service_connect_google_apis/versions.tf\n@@ -18,8 +18,8 @@ terraform {\n required_version = \">=0.12.6\"\n \n required_providers {\n- google-beta = {\n- source = \"hashicorp/google-beta\"\n+ google = {\n+ source = \"hashicorp/google\"\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:\nRemoved provider from main.tf and changed the provider name from google-beta to google in versions.tf\n\n---\n\nChoice A:\nexamples/private_service_connect_google_apis/main.tf\n@@ -16,14 +16,12 @@\n \n # [START vpc_subnet_private_access]\n resource \"google_compute_network\" \"network\" {\n- provider = google-beta\n project = var.project # Replace this with your project ID in quotes\n name = \"tf-test\"\n auto_create_subnetworks = false\n }\n \n resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"test-subnetwork\"\n ip_cidr_range = \"10.2.0.0/16\"\n@@ -35,7 +33,6 @@ resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n \n # [START compute_internal_ip_private_access]\n resource \"google_compute_global_address\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"global-psconnect-ip\"\n address_type = \"INTERNAL\"\n@@ -47,7 +44,6 @@ resource \"google_compute_global_address\" \"default\" {\n \n # [START compute_forwarding_rule_private_access]\n resource \"google_compute_global_forwarding_rule\" \"default\" {\n- provider = google-beta\n project = = google_compute_network.network.project\n name = \"globalrule\"\n target = \"all-apis\"\n---\nexamples/private_service_connect_google_apis/versions.tf\n@@ -18,8 +18,8 @@ terraform {\n required_version = \">=0.12.6\"\n \n required_providers {\n- google-beta = {\n- source = \"hashicorp/google-beta\"\n+ google = {\n+ source = \"hashicorp/google\"\n }\n }\n }\n---\n\n\n---\n\nChoice B:\nexamples/private_service_connect_google_apis/main.tf\n@@ -16,14 +16,12 @@\n \n [START vpc_subnet_private_access]\n resource \"google_compute_network\" \"network\" {\n- provider = google-beta\n project = var.project # Replace this with your project ID in quotes\n name = \"tf-test\"\n auto_create_subnetworks = false\n }\n \n resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"test-subnetwork\"\n ip_cidr_range = \"10.2.0.0/16\"\n@@ -35,7 +33,6 @@ resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n \n # [START compute_internal_ip_private_access]\n resource \"google_compute_global_address\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"global-psconnect-ip\"\n address_type = \"INTERNAL\"\n@@ -47,7 +44,6 @@ resource \"google_compute_global_address\" \"default\" {\n \n # [START compute_forwarding_rule_private_access]\n resource \"google_compute_global_forwarding_rule\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"globalrule\"\n target = \"all-apis\"\n---\nexamples/private_service_connect_google_apis/versions.tf\n@@ -18,8 +18,8 @@ terraform {\n required_version = \">=0.12.6\"\n \n required_providers {\n- google-beta = {\n- source = \"hashicorp/google-beta\"\n+ google = {\n+ source = \"hashicorp/google\"\n }\n }\n }\n---\n\n\n---\n\nChoice C:\nexamples/private_service_connect_google_apis/main.tf\n@@ -16,14 +16,12 @@\n \n # [START vpc_subnet_private_access]\n resource \"google_compute_network\" \"network\" {\n- provider = google-beta\n project = var.project # Replace this with your project ID in quotes\n name = \"tf-test\"\n auto_create_subnetworks = false\n }\n \n resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"test-subnetwork\"\n ip_cidr_range = \"10.2.0.0/16\"\n@@ -35,7 +33,6 @@ resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n \n # [START compute_internal_ip_private_access]\n resource \"google_compute_global_address\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"global-psconnect-ip\"\n address_type = \"INTERNAL\"\n@@ -47,7 +44,6 @@ resource \"google_compute_global_address\" \"default\" {\n \n # [START compute_forwarding_rule_private_access]\n resource \"google_compute_global_forwarding_rule\" \"default\" {\n- provider {\n = google-beta\n project = google_compute_network.network.project\n name = \"globalrule\"\n target = \"all-apis\"\n---\nexamples/private_service_connect_google_apis/versions.tf\n@@ -18,8 +18,8 @@ terraform {\n required_version = \">=0.12.6\"\n \n required_providers {\n- google-beta = {\n- source = \"hashicorp/google-beta\"\n+ google = {\n+ source = \"hashicorp/google\"\n }\n }\n }\n---\n\n\n---\n\nChoice D:\nexamples/private_service_connect_google_apis/main.tf\n@@ -16,14 +16,12 @@\n \n # [START vpc_subnet_private_access]\n resource \"google_compute_network\" \"network\" {\n- provider = google-beta\n project = var.project # Replace this with your project ID in quotes\n name = \"tf-test\"\n auto_create_subnetworks = false\n }\n \n resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"test-subnetwork\"\n ip_cidr_range = \"10.2.0.0/16\"\n@@ -35,7 +33,6 @@ resource \"google_compute_subnetwork\" \"vpc_subnetwork\" {\n \n # [START compute_internal_ip_private_access]\n resource \"google_compute_global_address\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"global-psconnect-ip\"\n address_type = \"INTERNAL\"\n@@ -47,7 +44,6 @@ resource \"google_compute_global_address\" \"default\" {\n \n # [START compute_forwarding_rule_private_access]\n resource \"google_compute_global_forwarding_rule\" \"default\" {\n- provider = google-beta\n project = google_compute_network.network.project\n name = \"globalrule\"\n target = \"all-apis\"\n---\nexamples/private_service_connect_google_apis/versions.tf\n@@ -18,8 +18,8 @@ terraform {\n required_version = \">=0.12.6\"\n \n required_providers {\n- google-beta = {\n- source = \"hashicorp/google-beta\"\n+ google = {\n+ source = \"hashicorp/google\"\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:\nsrc_threat_intelligences is missing from the variable object definition.\n\n---\n\nChoice A:\nmodules/network-firewall-policy/README.md\n@@ -135,7 +135,7 @@ module \"firewall_rules\" {\n | policy\\_name | User-provided name of the Network firewall policy | `string` | n/a | yes |\n | policy\\_region | Location of the firewall policy. Needed for regional firewall policies. Default is null (Global firewall policy) | `string` | `null` | no |\n | project\\_id | Project ID of the Network firewall policy | `string` | n/a | yes |\n-| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n+| rules List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_threat_intelligences = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n | target\\_vpcs | List of target VPC IDs that the firewall policy will be attached to | `list(string)` | `[]` | no |\n \n ## Outputs\n---\nmodules/network-firewall-policy/variables.tf\n@@ -63,6 +63,7 @@ variable \"rules\" {\n src_fqdns = optional(list(string), [])\n src_region_codes = optional(list(string), [])\n src_secure_tags = optional(list(string), [])\n+ src_threat_intelligences = optional(list(string), [])\n src_address_groups = optional(list(string), [])\n dest_ip_ranges = optional(list(string), [])\n dest_fqdns = optional(list(string), [])\n---\n\n\n---\n\nChoice B:\nmodules/network-firewall-policy/README.md\n@@ -135,7 +135,7 @@ module \"firewall_rules\" {\n | policy\\_name | User-provided name of the Network firewall policy | `string` | n/a | yes |\n | policy\\_region | Location of the firewall policy. Needed for regional firewall policies. Default is null (Global firewall policy) | `string` | `null` | no |\n | project\\_id | Project ID of the Network firewall policy | `string` | n/a | yes |\n-| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n+| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_threat_intelligences = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n | target\\_vpcs | List of target VPC IDs that the firewall policy will be attached to | `list(string)` | `[]` | no |\n \n ## Outputs\n---\nmodules/network-firewall-policy/variables.tf\n@@ -63,6 +63,7 @@ variable \"rules\" {\n src_fqdns = optional(list(string), [])\n src_region_codes = optional(list(string), [])\n src_secure_tags = optional(list(string), [])\n+ src_threat_intelligences = optional(list(string), [])\n src_address_groups = optional(list(string), [])\n dest_ip_ranges = optional(list(string), [])\n dest_fqdns = optional(list(string), [])\n---\n\n\n---\n\nChoice C:\nmodules/network-firewall-policy/README.md\n@@ -135,7 +135,7 @@ module \"firewall_rules\" {\n | policy\\_name | User-provided name of the Network firewall policy | `string` | n/a | yes |\n | policy\\_region | Location of the firewall policy. Needed for regional firewall policies. Default is null (Global firewall policy) | `string` | `null` | no |\n | project\\_id | Project ID of the Network firewall policy | `string` | n/a | yes |\n-| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n+| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_threat_intelligences = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n | target\\_vpcs | List of target VPC IDs that the firewall policy will be attached to | `list(string)` | `[]` | no |\n \n ## Outputs\n---\nmodules/network-firewall-policy/variables.tf\n@@ -63,6 +63,7 @@ variable \"rules\" {\n src_fqdns = optional(list(string), [])\n src_region_codes = optional(list(string), [])\n src_secure_tags = optional(list(string), [])\n+ src_threat_intelligences = optional(list(string), [])\n src_address_groups = optional(list(string), [])\n dest_ip_ranges = optional(list(string), [])\n dest_fqdns = optional(list(string), [])\n---\n\n\n---\n\nChoice D:\nmodules/network-firewall-policy/README.md\n@@ -135,7 +135,7 @@ module \"firewall_rules\" {\n | policy\\_name | User-provided name of the Network firewall policy | `string` | n/a | yes |\n | policy\\_region | Location of the firewall policy. Needed for regional firewall policies. Default is null (Global firewall policy) | `string` | `null` | no |\n | project\\_id | Project ID of the Network firewall policy | `string` | n/a | yes |\n-| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = | description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n+| rules | List of Ingress/Egress rules | <pre>list(object({<br> priority = number<br> direction = string<br> action = string<br> rule_name = optional(string)<br> disabled = optional(bool)<br> description = optional(string)<br> enable_logging = optional(bool)<br> target_secure_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> match = object({<br> src_ip_ranges = optional(list(string), [])<br> src_fqdns = optional(list(string), [])<br> src_region_codes = optional(list(string), [])<br> src_secure_tags = optional(list(string), [])<br> src_threat_intelligences = optional(list(string), [])<br> src_address_groups = optional(list(string), [])<br> dest_ip_ranges = optional(list(string), [])<br> dest_fqdns = optional(list(string), [])<br> dest_region_codes = optional(list(string), [])<br> dest_threat_intelligences = optional(list(string), [])<br> dest_address_groups = optional(list(string), [])<br> layer4_configs = optional(list(object({<br> ip_protocol = optional(string, \"all\")<br> ports = optional(list(string), [])<br> })), [{}])<br> })<br> }))</pre> | `[]` | no |\n | target\\_vpcs | List of target VPC IDs that the firewall policy will be attached to | `list(string)` | `[]` | no |\n \n ## Outputs\n---\nmodules/network-firewall-policy/variables.tf\n@@ -63,6 +63,7 @@ variable \"rules\" {\n src_fqdns = optional(list(string), [])\n src_region_codes = optional(list(string), [])\n src_secure_tags = optional(list(string), [])\n+ src_threat_intelligences = optional(list(string), [])\n src_address_groups = optional(list(string), [])\n dest_ip_ranges = optional(list(string), [])\n dest_fqdns = optional(list(string), [])\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP 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 | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit) | `v0.10.3` -> `v0.11.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMDMuMSIsInVwZGF0ZWRJblZlciI6IjM3LjEwMy4xIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->\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.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1\n \tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n@@ -39,7 +39,9 @@ require (\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 v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.18.0 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 // indirect\n \tgithub.com/hashicorp/terraform-json v0.17.1 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n \tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3 h1:+9yoC2MqfIWzRfsyNm0VUtFR0Fq0JnQwGqq8HOpJzcs=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3/go.mod h1:2YEDqxvHykrzy33Mu9Npm6LLY6DScML5tAAciIqc8Bs=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1 h1:S4Y7o5RKRC9Bk71VszCx9NeheWjdSAn5ejPuD1W6lNE=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1/go.mod h1:v4TFK9TmX4mYyXL3v9wFXVN3A5vrt2LaVDBX2/OVU7Y=\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@@ -368,8 +368,12 @@ github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mO\n github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=\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/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+DbLISwf2B8WXEolNRA8BGCwI9jws=\n+github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.18.0 h1:wYnG7Lt31t2zYkcquwgKo6MWXzRUDIeIVU5naZwHLl8=\n github.com/hashicorp/hcl/v2 v2.18.0/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 h1:nZ5gGjbe5o7XUu1d7j+Y5Ztcxlp+yaumTKH9i0D3wlg=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72/go.mod h1:l8HcFPm9cQh6Q0KSWoYPiePqMvRFenybP1CH2MjKdlg=\n github.com/hashicorp/terraform-json v0.17.1 h1:eMfvh/uWggKmY7Pmb3T85u86E2EQg6EQHgyRwf3RkyA=\n github.com/hashicorp/terraform-json v0.17.1/go.mod h1:Huy6zt6euxaY9knPAFKjUITn8QxUFIe9VuSzb4zn/0o=\n github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=\n@@ -420,6 +424,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L\n github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=\n github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=\n github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=\n+github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=\n+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=\n github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=\n github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=\n github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=\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 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1\n \tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n@@ -39,7 +39,9 @@ require (\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // v2.18.0 \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n+\tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.18.0 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 // indirect\n \tgithub.com/hashicorp/terraform-json v0.17.1 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n \tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3 h1:+9yoC2MqfIWzRfsyNm0VUtFR0Fq0JnQwGqq8HOpJzcs=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3/go.mod h1:2YEDqxvHykrzy33Mu9Npm6LLY6DScML5tAAciIqc8Bs=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1 h1:S4Y7o5RKRC9Bk71VszCx9NeheWjdSAn5ejPuD1W6lNE=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1/go.mod h1:v4TFK9TmX4mYyXL3v9wFXVN3A5vrt2LaVDBX2/OVU7Y=\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@@ -368,8 +368,12 @@ github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mO\n github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=\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/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+DbLISwf2B8WXEolNRA8BGCwI9jws=\n+github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.18.0 h1:wYnG7Lt31t2zYkcquwgKo6MWXzRUDIeIVU5naZwHLl8=\n github.com/hashicorp/hcl/v2 v2.18.0/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 h1:nZ5gGjbe5o7XUu1d7j+Y5Ztcxlp+yaumTKH9i0D3wlg=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72/go.mod h1:l8HcFPm9cQh6Q0KSWoYPiePqMvRFenybP1CH2MjKdlg=\n github.com/hashicorp/terraform-json v0.17.1 h1:eMfvh/uWggKmY7Pmb3T85u86E2EQg6EQHgyRwf3RkyA=\n github.com/hashicorp/terraform-json v0.17.1/go.mod h1:Huy6zt6euxaY9knPAFKjUITn8QxUFIe9VuSzb4zn/0o=\n github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=\n@@ -420,6 +424,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L\n github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=\n github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=\n github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=\n+github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=\n+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=\n github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=\n github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=\n github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=\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.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1\n \tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n@@ -39,7 +39,9 @@ require (\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 v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.18.0 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 // indirect\n \tgithub.com/hashicorp/terraform-json v0.17.1 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n \tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3 h1:+9yoC2MqfIWzRfsyNm0VUtFR0Fq0JnQwGqq8HOpJzcs=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3/go.mod h1:2YEDqxvHykrzy33Mu9Npm6LLY6DScML5tAAciIqc8Bs=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1 h1:S4Y7o5RKRC9Bk71VszCx9NeheWjdSAn5ejPuD1W6lNE=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1/go.mod h1:v4TFK9TmX4mYyXL3v9wFXVN3A5vrt2LaVDBX2/OVU7Y=\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@@ -368,8 +368,12 @@ github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mO\n github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=\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/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+DbLISwf2B8WXEolNRA8BGCwI9jws=\n+github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.18.0 h1:wYnG7Lt31t2zYkcquwgKo6MWXzRUDIeIVU5naZwHLl8=\n github.com/hashicorp/hcl/v2 v2.18.0/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 h1:nZ5gGjbe5o7XUu1d7j+Y5Ztcxlp+yaumTKH9i0D3wlg=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72/go.mod h1:l8HcFPm9cQh6Q0KSWoYPiePqMvRFenybP1CH2MjKdlg=\n github.com/hashicorp/terraform-json v0.17.1 h1:eMfvh/uWggKmY7Pmb3T85u86E2EQg6EQHgyRwf3RkyA=\n github.com/hashicorp/terraform-json v0.17.1/go.mod h1:Huy6zt6euxaY9knPAFKjUITn8QxUFIe9VuSzb4zn/0o=\n github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=\n@@ -420,6 +424,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L\n github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=\n github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=\n github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=\n+github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=\n+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=\n github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=\n github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=\n github.com/stretchr/objx v1.6.0 h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=\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.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1\n \tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n@@ -39,7 +39,9 @@ require v2.18.0/go.mod \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 v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.18.0 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 // indirect\n \tgithub.com/hashicorp/terraform-json v0.17.1 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n \tgithub.com/jmespath/go-jmespath v0.4.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3 h1:+9yoC2MqfIWzRfsyNm0VUtFR0Fq0JnQwGqq8HOpJzcs=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3/go.mod h1:2YEDqxvHykrzy33Mu9Npm6LLY6DScML5tAAciIqc8Bs=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1 h1:S4Y7o5RKRC9Bk71VszCx9NeheWjdSAn5ejPuD1W6lNE=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.11.1/go.mod h1:v4TFK9TmX4mYyXL3v9wFXVN3A5vrt2LaVDBX2/OVU7Y=\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@@ -368,8 +368,12 @@ github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mO\n github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=\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/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+DbLISwf2B8WXEolNRA8BGCwI9jws=\n+github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.18.0 h1:wYnG7Lt31t2zYkcquwgKo6MWXzRUDIeIVU5naZwHLl8=\n github.com/hashicorp/hcl/v2 v2.18.0/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 h1:nZ5gGjbe5o7XUu1d7j+Y5Ztcxlp+yaumTKH9i0D3wlg=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72/go.mod h1:l8HcFPm9cQh6Q0KSWoYPiePqMvRFenybP1CH2MjKdlg=\n github.com/hashicorp/terraform-json v0.17.1 h1:eMfvh/uWggKmY7Pmb3T85u86E2EQg6EQHgyRwf3RkyA=\n github.com/hashicorp/terraform-json v0.17.1/go.mod h1:Huy6zt6euxaY9knPAFKjUITn8QxUFIe9VuSzb4zn/0o=\n github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=\n@@ -420,6 +424,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L\n github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=\n github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=\n github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=\n+github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=\n+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=\n github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=\n github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=\n github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=\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:\nThe current module that manages subnets gives the possibility of creating secondary networks, however in some cases, we simply need to ignore the management of this block.\r\nThis is because, for example, when a GKE cluster is created on a subnet that is being managed by Terraform, if that cluster is configured to automatically create secondary networks, this module will attempt to remove these networks.\r\nTherefore, the objective of this change is basically to modify the behavior of the secondary_ip_range block so that it is only defined if the secondary networks were actually defined in code, thus meaning that the block does not exist if the list is empty.\r\n\r\nRef: https://cloud.google.com/kubernetes-engine/docs/concepts/alias-ips#range_management\n\n---\n\nChoice A:\nmodules/subnets-beta/main.tf\n@@ -52,16 +52,14 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n network = var.network_name\n project = var.project_id\n description = lookup(each.value, \"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- : []\n- )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n- dynamic \"secondary_ip_range\" {\n+ for_each = contains(keys(var.secondary_ranges), each.value.subnet_name) == true ? var.secondary_ranges[each.value.subnet_name] : []\n+\n+ content {\n+ range_name = secondary_ip_range.value.range_name\n+ ip_cidr_range = secondary_ip_range.value.ip_cidr_range\n+ }\n+ }\n \n purpose = lookup(each.value, \"purpose\", null)\n role = lookup(each.value, \"role\", null)\n---\nmodules/subnets/main.tf\n@@ -52,16 +52,14 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n network = var.network_name\n project = var.project_id\n description = lookup(each.value, \"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- : []\n- )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n- ]\n+ dynamic \"secondary_ip_range\" {\n+ for_each = contains(keys(var.secondary_ranges), each.value.subnet_name) == true ? var.secondary_ranges[each.value.subnet_name] : []\n+\n+ content {\n+ range_name = secondary_ip_range.value.range_name\n+ ip_cidr_range = secondary_ip_range.value.ip_cidr_range\n+ }\n+ }\n \n purpose = lookup(each.value, \"purpose\", null)\n role = lookup(each.value, \"role\", null)\n---\n\n\n---\n\nChoice B:\nmodules/subnets-beta/main.tf\n@@ -52,16 +52,14 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n network = var.network_name\n project = var.project_id\n description = lookup(each.value, \"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- : []\n- )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n- ]\n+ dynamic \"secondary_ip_range\" {\n+ for_each = contains(keys(var.secondary_ranges), each.value.subnet_name) == true ? var.secondary_ranges[each.value.subnet_name] : []\n+\n+ content {\n+ range_name = secondary_ip_range.value.range_name\n+ ip_cidr_range = secondary_ip_range.value.ip_cidr_range\n+ }\n+ }\n \n purpose = lookup(each.value, \"purpose\", null)\n role = lookup(each.value, \"role\", null)\n---\nmodules/subnets/main.tf\n@@ -52,16 +52,14 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n network = var.network_name\n project = var.project_id\n description = lookup(each.value, \"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- : []\n- )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n- ]\n+ dynamic \"secondary_ip_range\" {\n+ for_each = contains(keys(var.secondary_ranges), each.value.subnet_name) == true ? var.secondary_ranges[each.value.subnet_name] : []\n+\n+ content {\n+ range_name = secondary_ip_range.value.range_name\n+ ip_cidr_range = secondary_ip_range.value.ip_cidr_range\n+ }\n+ }\n \n purpose = lookup(each.value, \"purpose\", null)\n role = lookup(each.value, \"role\", null)\n---\n\n\n---\n\nChoice C:\nmodules/subnets-beta/main.tf\n@@ -52,16 +52,14 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n network = var.network_name\n project = var.project_id\n description = lookup(each.value, \"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- : []\n- )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n- ]\n+ dynamic \"secondary_ip_range\" {\n+ for_each = contains(keys(var.secondary_ranges), each.value.subnet_name) == true ? var.secondary_ranges[each.value.subnet_name] : []\n+\n+ content {\n+ range_name = secondary_ip_range.value.range_name\n+ ip_cidr_range = secondary_ip_range.value.ip_cidr_range\n+ }\n+ }\n \n purpose = lookup(each.value, \"purpose\", null)\n role = lookup(each.value, \"role\", null)\n---\nmodules/subnets/main.tf\n@@ -52,16 +52,14 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n network = var.network_name\n project = var.project_id\n description = lookup(each.value, \"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- : []\n- )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n- ]\n+ dynamic \"secondary_ip_range\" {\n+ for_each = contains(keys(var.secondary_ranges), each.value.subnet_name) == true ? var.secondary_ranges[each.value.subnet_name] : []\n+\n+ content {\n+ range_name = secondary_ip_range.value.range_name\n+ ip_cidr_range = secondary_ip_range.value.ip_cidr_range\n+ }\n+ }\n \n purpose = lookup(each.value, \"purpose\", null)\n role = lookup(each.value, \"role\", null)\n---\n\n\n---\n\nChoice D:\nmodules/subnets-beta/main.tf\n@@ -52,16 +52,14 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n network = var.network_name\n project = var.project_id\n description = lookup(each.value, \"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- : []\n- )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n- ]\n+ dynamic \"secondary_ip_range\" {\n+ for_each = contains(keys(var.secondary_ranges), each.value.subnet_name) == true ? var.secondary_ranges[each.value.subnet_name] : []\n+\n+ content {\n+ range_name = secondary_ip_range.value.range_name\n+ ip_cidr_range = secondary_ip_range.value.ip_cidr_range\n+ }\n+ }\n \n purpose = lookup(each.value, \"purpose\", null)\n role = lookup(each.value, \"role\", null)\n---\nmodules/subnets/main.tf\n@@ -52,16 +52,14 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n network = var.network_name\n +52,14 project = var.project_id\n description = lookup(each.value, \"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- : []\n- )) :\n- var.secondary_ranges[each.value.subnet_name][i]\n- ]\n+ dynamic \"secondary_ip_range\" {\n+ for_each = contains(keys(var.secondary_ranges), each.value.subnet_name) == true ? var.secondary_ranges[each.value.subnet_name] : []\n+\n+ content {\n+ range_name = secondary_ip_range.value.range_name\n+ ip_cidr_range = secondary_ip_range.value.ip_cidr_range\n+ }\n+ }\n \n purpose = lookup(each.value, \"purpose\", null)\n role = lookup(each.value, \"role\", null)\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:\nBumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.14.0 to 0.17.0.\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/golang/crypto/commit/9d2ee975ef9fe627bf0a6f01c1f69e8ef1d4f05d\"><code>9d2ee97</code></a> ssh: implement strict KEX protocol changes</li>\n<li><a href=\"https://github.com/golang/crypto/commit/4e5a26183ecb4f9a0f85c8f8dbe7982885435436\"><code>4e5a261</code></a> ssh: close net.Conn on all NewServerConn errors</li>\n<li><a href=\"https://github.com/golang/crypto/commit/152cdb1503ebc13bc0fbb68f92ee189ebf9e3d00\"><code>152cdb1</code></a> x509roots/fallback: update bundle</li>\n<li><a href=\"https://github.com/golang/crypto/commit/fdfe1f8531a1adcc300c8eba98cb372044826d62\"><code>fdfe1f8</code></a> ssh: defer channel window adjustment</li>\n<li><a href=\"https://github.com/golang/crypto/commit/b8ffc16e10063067bac0e15c6d7f7995937503ce\"><code>b8ffc16</code></a> blake2b: drop Go 1.6, Go 1.8 compatibility</li>\n<li><a href=\"https://github.com/golang/crypto/commit/7e6fbd82c804e1760feb603fe21caecb0af0a124\"><code>7e6fbd8</code></a> ssh: wrap errors from client handshake</li>\n<li><a href=\"https://github.com/golang/crypto/commit/bda2f3f5cfce3f27039acccd823693f6d67c2a74\"><code>bda2f3f</code></a> argon2: avoid clobbering BP</li>\n<li><a href=\"https://github.com/golang/crypto/commit/325b735346247f48971d2b37d24dd180a35f391f\"><code>325b735</code></a> ssh/test: skip TestSSHCLIAuth on Windows</li>\n<li><a href=\"https://github.com/golang/crypto/commit/1eadac50a566dfaa1b603ca15e8ad3cbd1c77b20\"><code>1eadac5</code></a> go.mod: update golang.org/x dependencies</li>\n<li><a href=\"https://github.com/golang/crypto/commit/b2d7c26edb17864f117d8b0ee73c1843bcc6090f\"><code>b2d7c26</code></a> ssh: add (*Client).DialContext method</li>\n<li>Additional commits viewable in <a href=\"https://github.com/golang/crypto/compare/v0.14.0...v0.17.0\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/terraform-google-modules/terraform-google-network/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -58,13 +58,13 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.14.0 // indirect\n+\tgolang.org/x/crypto v0.17.0 // indirect\n \tgolang.org/x/mod v0.14.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n-\tgolang.org/x/sys v0.13.0 // indirect\n-\tgolang.org/x/text v0.13.0 // indirect\n+\tgolang.org/x/sys v0.15.0 // indirect\n+\tgolang.org/x/text v0.14.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n \tgoogle.golang.org/appengine v1.6.8 // indirect\n---\ntest/integration/go.sum\n@@ -472,8 +472,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U\n golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=\n golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=\n-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=\n+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=\n+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=\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@@ -667,13 +667,13 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc\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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=\n-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=\n+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=\n-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=\n+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=\n+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=\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@@ -685,8 +685,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=\n golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=\n golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=\n-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=\n+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=\n+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=\n golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -58,13 +58,13 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.14.0 // indirect\n+\tgolang.org/x/crypto v0.17.0 // indirect\n \tgolang.org/x/mod v0.14.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n-\tgolang.org/x/sys v0.13.0 // indirect\n-\tgolang.org/x/text v0.13.0 // indirect\n+\tgolang.org/x/sys v0.15.0 // indirect\n+\tgolang.org/x/text v0.14.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=\n@@ \tgoogle.golang.org/api v0.138.0 // indirect\n \tgoogle.golang.org/appengine v1.6.8 // indirect\n---\ntest/integration/go.sum\n@@ -472,8 +472,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U\n golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=\n golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=\n-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=\n+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=\n+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=\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@@ -667,13 +667,13 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc\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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=\n-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=\n+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=\n-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=\n+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=\n+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=\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@@ -685,8 +685,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=\n golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=\n golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=\n-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=\n+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=\n+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=\n golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -58,13 +58,13 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.14.0 // indirect\n+\tgolang.org/x/crypto v0.17.0 // indirect\n \tgolang.org/x/mod v0.14.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n-\tgolang.org/x/sys v0.13.0 // indirect\n-\tgolang.org/x/text v0.13.0 // indirect\n+\tgolang.org/x/sys v0.15.0 // indirect\n+\tgolang.org/x/text v0.14.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n \tgoogle.golang.org/appengine v1.6.8 // indirect\n---\ntest/integration/go.sum\n@@ -472,8 +472,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U\n golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=\n golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=\n-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=\n+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=\n+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=\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/term v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=\n@@ -667,13 +667,13 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc\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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=\n-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=\n+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=\n-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=\n+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=\n+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=\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@@ -685,8 +685,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=\n golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=\n golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=\n golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=\n-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=\n+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=\n+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=\n golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -58,13 +58,13 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.14.0 // indirect\n+\tgolang.org/x/crypto v0.17.0 // indirect\n \tgolang.org/x/mod v0.14.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n-\tgolang.org/x/sys v0.13.0 // indirect\n-\tgolang.org/x/text v0.13.0 // indirect\n+\tgolang.org/x/sys v0.15.0 // indirect\n+\tgolang.org/x/text v0.14.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n \tgoogle.golang.org/appengine v1.6.8 // indirect\n---\ntest/integration/go.sum\n@@ -472,8 +472,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U\n golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=\n golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=\n-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=\n+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=\n+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=\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@@ -667,13 +667,13 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc\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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=\n-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=\n+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=\n-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=\n+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=\n+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=\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@@ -685,8 +685,8 @@ golang.org/x/text v0.3.6/go.mod indirect\n golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=\n golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=\n golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=\n-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=\n-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=\n+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=\n+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=\n golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=\n---\n\n\n---\n"
}
] |
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 | patch | `v0.10.2` -> `v0.10.3` | `v0.11.0` |\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy45My4xIiwidXBkYXRlZEluVmVyIjoiMzcuOTMuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3\n \tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n@@ -73,8 +73,8 @@ require (\n \tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/grpc v1.58.3 // indirect\n \tgoogle.golang.org/protobuf v1.31.0 // 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-20230905202853-d090da108d2f // indirect\n-\tsigs.k8s.io/kustomize/kyaml v0.15.0 // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.16.0 // indirect\n+\tsigs.k8s.io/yaml v1.4.0 // indirect\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n v0.10.2 h1:VumKmHhd+jO9nZCUzKltGKv4U5j1hxueRzBaoch+SvY=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3 h1:+9yoC2MqfIWzRfsyNm0VUtFR0Fq0JnQwGqq8HOpJzcs=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3/go.mod h1:2YEDqxvHykrzy33Mu9Npm6LLY6DScML5tAAciIqc8Bs=\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@@ -1000,7 +1000,7 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=\n rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=\n-sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=\n-sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=\n-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=\n-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=\n+sigs.k8s.io/kustomize/kyaml v0.16.0 h1:6J33uKSoATlKZH16unr2XOhDI+otoe2sR3M8PDzW3K0=\n+sigs.k8s.io/kustomize/kyaml v0.16.0/go.mod h1:xOK/7i+vmE14N2FdFyugIshB8eF6ALpy7jI87Q2nRh4=\n+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=\n+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=\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 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3\n \tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n@@ -73,8 +73,8 @@ require (\n \tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/grpc v1.58.3 // indirect\n \tgoogle.golang.org/protobuf v1.31.0 // 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-20230905202853-d090da108d2f // indirect\n-\tsigs.k8s.io/kustomize/kyaml v0.15.0 // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.16.0 // indirect\n+\tsigs.k8s.io/yaml v1.4.0 // indirect\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2 h1:VumKmHhd+jO9nZCUzKltGKv4U5j1hxueRzBaoch+SvY=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3 h1:+9yoC2MqfIWzRfsyNm0VUtFR0Fq0JnQwGqq8HOpJzcs=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3/go.mod h1:2YEDqxvHykrzy33Mu9Npm6LLY6DScML5tAAciIqc8Bs=\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@@ -1000,7 +1000,7 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=\n rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=\n-sigs.k8s.io/kustomize/kyaml v3.0.1 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=\n-sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=\n-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=\n-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=\n+sigs.k8s.io/kustomize/kyaml v0.16.0 h1:6J33uKSoATlKZH16unr2XOhDI+otoe2sR3M8PDzW3K0=\n+sigs.k8s.io/kustomize/kyaml v0.16.0/go.mod h1:xOK/7i+vmE14N2FdFyugIshB8eF6ALpy7jI87Q2nRh4=\n+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=\n+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=\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.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3\n \tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n@@ -73,8 +73,8 @@ require (\n \tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/grpc v1.58.3 // indirect\n \tgoogle.golang.org/protobuf v1.31.0 // 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-20230905202853-d090da108d2f // indirect\n-\tsigs.k8s.io/kustomize/kyaml v0.15.0 // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.16.0 // indirect\n+\tsigs.k8s.io/yaml v1.4.0 // indirect\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2 h1:VumKmHhd+jO9nZCUzKltGKv4U5j1hxueRzBaoch+SvY=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3 h1:+9yoC2MqfIWzRfsyNm0VUtFR0Fq0JnQwGqq8HOpJzcs=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3/go.mod h1:2YEDqxvHykrzy33Mu9Npm6LLY6DScML5tAAciIqc8Bs=\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@@ -1000,7 +1000,7 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=\n rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=\n-sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=\n-sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=\n-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=\n-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=\n+sigs.k8s.io/kustomize/kyaml v0.16.0 h1:6J33uKSoATlKZH16unr2XOhDI+otoe2sR3M8PDzW3K0=\n+sigs.k8s.io/kustomize/kyaml v0.16.0/go.mod h1:xOK/7i+vmE14N2FdFyugIshB8eF6ALpy7jI87Q2nRh4=\n+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=\n+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -3,7 +187,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3\n \tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n@@ -73,8 +73,8 @@ require (\n \tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/grpc v1.58.3 // indirect\n \tgoogle.golang.org/protobuf v1.31.0 // 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-20230905202853-d090da108d2f // indirect\n-\tsigs.k8s.io/kustomize/kyaml v0.15.0 // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.16.0 // indirect\n+\tsigs.k8s.io/yaml v1.4.0 // indirect\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2 h1:VumKmHhd+jO9nZCUzKltGKv4U5j1hxueRzBaoch+SvY=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3 h1:+9yoC2MqfIWzRfsyNm0VUtFR0Fq0JnQwGqq8HOpJzcs=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.3/go.mod h1:2YEDqxvHykrzy33Mu9Npm6LLY6DScML5tAAciIqc8Bs=\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@@ -1000,7 +1000,7 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=\n rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=\n-sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=\n-sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=\n-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=\n-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=\n+sigs.k8s.io/kustomize/kyaml v0.16.0 h1:6J33uKSoATlKZH16unr2XOhDI+otoe2sR3M8PDzW3K0=\n+sigs.k8s.io/kustomize/kyaml v0.16.0/go.mod h1:xOK/7i+vmE14N2FdFyugIshB8eF6ALpy7jI87Q2nRh4=\n+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=\n+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=\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 | Pending |\n|---|---|---|---|---|\n| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit) | require | patch | `v0.10.1` -> `v0.10.2` | `v0.10.3` |\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.46.7` -> `v0.46.8` | |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.46.8`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.8)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.46.7...v0.46.8)\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#### Description\n\n- Updated `k8s.io/apimachinery` from `v0.27.2` to `v0.28.4`.\n- Updated `k8s.io/client-go` from `v0.27.2` to `v0.28.4`.\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- [@​marcofranssen](https://togithub.com/marcofranssen)\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/1375](https://togithub.com/gruntwork-io/terratest/pull/1375)\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy44Ny4yIiwidXBkYXRlZEluVmVyIjoiMzcuODcuMiIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n-\tgithub.com/gruntwork-io/terratest v0.46.7\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2\n+\tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod github.com/googleapis/gax-go/v2 v0.10.1 h1:eOqSlege+69h9JhR/ydpHCBLCfQmJuznPGdhLY/SDcU=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1/go.mod h1:R0AXqSshPDVYHGopYGwPxguApNpFFOdaVAJ8XO2BxJ0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2 h1:VumKmHhd+jO9nZCUzKltGKv4U5j1hxueRzBaoch+SvY=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\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@@ -351,8 +351,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.7 h1:oqGPBBO87SEsvBYaA0R5xOq+Lm2Xc5dmFVfxEolfZeU=\n-github.com/gruntwork-io/terratest v0.46.7/go.mod h1:6gI5MlLeyF+SLwqocA5GBzcTix+XiuxCy1BPwKuT+WM=\n+github.com/gruntwork-io/terratest v0.46.8 h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n+github.com/gruntwork-io/terratest v0.46.8/go.mod h1:6MxfmOFQQEpQZjpuWRwuAK8qm836hYgAOCzSIZIWTmg=\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@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n-\tgithub.com/gruntwork-io/terratest v0.46.7\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2\n+\tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.46.7\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test 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.10.1 h1:eOqSlege+69h9JhR/ydpHCBLCfQmJuznPGdhLY/SDcU=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1/go.mod h1:R0AXqSshPDVYHGopYGwPxguApNpFFOdaVAJ8XO2BxJ0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2 h1:VumKmHhd+jO9nZCUzKltGKv4U5j1hxueRzBaoch+SvY=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\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@@ -351,8 +351,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.7 h1:oqGPBBO87SEsvBYaA0R5xOq+Lm2Xc5dmFVfxEolfZeU=\n-github.com/gruntwork-io/terratest v0.46.7/go.mod h1:6gI5MlLeyF+SLwqocA5GBzcTix+XiuxCy1BPwKuT+WM=\n+github.com/gruntwork-io/terratest v0.46.8 h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n+github.com/gruntwork-io/terratest v0.46.8/go.mod h1:6MxfmOFQQEpQZjpuWRwuAK8qm836hYgAOCzSIZIWTmg=\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@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n-\tgithub.com/gruntwork-io/terratest v0.46.7\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2\n+\tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\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.10.1 h1:eOqSlege+69h9JhR/ydpHCBLCfQmJuznPGdhLY/SDcU=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1/go.mod h1:R0AXqSshPDVYHGopYGwPxguApNpFFOdaVAJ8XO2BxJ0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2 h1:VumKmHhd+jO9nZCUzKltGKv4U5j1hxueRzBaoch+SvY=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\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@@ -351,8 +351,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.7 h1:oqGPBBO87SEsvBYaA0R5xOq+Lm2Xc5dmFVfxEolfZeU=\n-github.com/gruntwork-io/terratest v0.46.7/go.mod h1:6gI5MlLeyF+SLwqocA5GBzcTix+XiuxCy1BPwKuT+WM=\n+github.com/gruntwork-io/terratest v0.46.8 h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n+github.com/gruntwork-io/terratest v0.46.8/go.mod h1:6MxfmOFQQEpQZjpuWRwuAK8qm836hYgAOCzSIZIWTmg=\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@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n-\tgithub.com/gruntwork-io/terratest v0.46.7\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2\n+\tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1 h1:eOqSlege+69h9JhR/ydpHCBLCfQmJuznPGdhLY/SDcU=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1/go.mod h1:R0AXqSshPDVYHGopYGwPxguApNpFFOdaVAJ8XO2BxJ0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2 h1:VumKmHhd+jO9nZCUzKltGKv4U5j1hxueRzBaoch+SvY=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\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@@ -351,8 +351,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.7 h1:oqGPBBO87SEsvBYaA0R5xOq+Lm2Xc5dmFVfxEolfZeU=\n-github.com/gruntwork-io/terratest v0.46.7/go.mod h1:6gI5MlLeyF+SLwqocA5GBzcTix+XiuxCy1BPwKuT+WM=\n+github.com/gruntwork-io/terratest v0.46.8 h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n+github.com/gruntwork-io/terratest v0.46.8/go.mod h1:6MxfmOFQQEpQZjpuWRwuAK8qm836hYgAOCzSIZIWTmg=\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/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit) | require | patch | `v0.10.1` -> `v0.10.2` | `v0.10.3` |\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.46.7` -> `v0.46.8` | |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.46.8`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.8)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.46.7...v0.46.8)\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#### Description\n\n- Updated `k8s.io/apimachinery` from `v0.27.2` to `v0.28.4`.\n- Updated `k8s.io/client-go` from `v0.27.2` to `v0.28.4`.\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- [@​marcofranssen](https://togithub.com/marcofranssen)\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/1375](https://togithub.com/gruntwork-io/terratest/pull/1375)\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy44Ny4yIiwidXBkYXRlZEluVmVyIjoiMzcuODcuMiIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n-\tgithub.com/gruntwork-io/terratest v0.46.7\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2\n+\tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1 h1:eOqSlege+69h9JhR/ydpHCBLCfQmJuznPGdhLY/SDcU=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1/go.mod h1:R0AXqSshPDVYHGopYGwPxguApNpFFOdaVAJ8XO2BxJ0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2 h1:VumKmHhd+jO9nZCUzKltGKv4U5j1hxueRzBaoch+SvY=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\n github.com/OneOfOne/xxhash h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n+github.com/gruntwork-io/terratest 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@@ -351,8 +351,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.7 h1:oqGPBBO87SEsvBYaA0R5xOq+Lm2Xc5dmFVfxEolfZeU=\n-github.com/gruntwork-io/terratest v0.46.7/go.mod h1:6gI5MlLeyF+SLwqocA5GBzcTix+XiuxCy1BPwKuT+WM=\n+github.com/gruntwork-io/terratest v0.46.8 h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n+github.com/gruntwork-io/terratest v0.46.8/go.mod h1:6MxfmOFQQEpQZjpuWRwuAK8qm836hYgAOCzSIZIWTmg=\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@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n-\tgithub.com/gruntwork-io/terratest v0.46.7\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2\n+\tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb github.com/OneOfOne/xxhash h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1 h1:eOqSlege+69h9JhR/ydpHCBLCfQmJuznPGdhLY/SDcU=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1/go.mod h1:R0AXqSshPDVYHGopYGwPxguApNpFFOdaVAJ8XO2BxJ0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2 h1:VumKmHhd+jO9nZCUzKltGKv4U5j1hxueRzBaoch+SvY=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\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@@ -351,8 +351,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.7 h1:oqGPBBO87SEsvBYaA0R5xOq+Lm2Xc5dmFVfxEolfZeU=\n-github.com/gruntwork-io/terratest v0.46.7/go.mod h1:6gI5MlLeyF+SLwqocA5GBzcTix+XiuxCy1BPwKuT+WM=\n+github.com/gruntwork-io/terratest v0.46.8 h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n+github.com/gruntwork-io/terratest v0.46.8/go.mod h1:6MxfmOFQQEpQZjpuWRwuAK8qm836hYgAOCzSIZIWTmg=\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@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n-\tgithub.com/gruntwork-io/terratest v0.46.7\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2\n+\tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1 h1:eOqSlege+69h9JhR/ydpHCBLCfQmJuznPGdhLY/SDcU=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1/go.mod h1:R0AXqSshPDVYHGopYGwPxguApNpFFOdaVAJ8XO2BxJ0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2 h1:VumKmHhd+jO9nZCUzKltGKv4U5j1hxueRzBaoch+SvY=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\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@@ -351,8 +351,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\n github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n github.com/grpc-ecosystem/grpc-gateway github.com/googleapis/gax-go/v2 h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n-github.com/gruntwork-io/terratest v0.46.7 h1:oqGPBBO87SEsvBYaA0R5xOq+Lm2Xc5dmFVfxEolfZeU=\n-github.com/gruntwork-io/terratest v0.46.7/go.mod h1:6gI5MlLeyF+SLwqocA5GBzcTix+XiuxCy1BPwKuT+WM=\n+github.com/gruntwork-io/terratest v0.46.8 h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n+github.com/gruntwork-io/terratest v0.46.8/go.mod h1:6MxfmOFQQEpQZjpuWRwuAK8qm836hYgAOCzSIZIWTmg=\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@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.21\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n-\tgithub.com/gruntwork-io/terratest v0.46.7\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2\n+\tgithub.com/gruntwork-io/terratest v0.46.8\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1 h1:eOqSlege+69h9JhR/ydpHCBLCfQmJuznPGdhLY/SDcU=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1/go.mod h1:R0AXqSshPDVYHGopYGwPxguApNpFFOdaVAJ8XO2BxJ0=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2 h1:VumKmHhd+jO9nZCUzKltGKv4U5j1hxueRzBaoch+SvY=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.2/go.mod h1:sDPahz16/LVyT5feMgYcPPx68rozeDI3LaM9/5Ok9GA=\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@@ -351,8 +351,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.7 h1:oqGPBBO87SEsvBYaA0R5xOq+Lm2Xc5dmFVfxEolfZeU=\n-github.com/gruntwork-io/terratest v0.46.7/go.mod h1:6gI5MlLeyF+SLwqocA5GBzcTix+XiuxCy1BPwKuT+WM=\n+github.com/gruntwork-io/terratest v0.46.8 h1:rgK7z6Dy/eMGFaclKR0WVG9Z54tR+Ehl7S09+8Y25j0=\n+github.com/gruntwork-io/terratest v0.46.8/go.mod h1:6MxfmOFQQEpQZjpuWRwuAK8qm836hYgAOCzSIZIWTmg=\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 | Update | Change |\n|---|---|---|\n| cft/developer-tools | minor | `1.17` -> `1.18` |\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy44Ny4yIiwidXBkYXRlZEluVmVyIjoiMzcuODcuMiIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.17\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.18\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\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.17'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n---\ntest/integration/go.mod\n@@ -1,6 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.20\n+go 1.21\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n---\ntest/integration/go.sum\n@@ -247,6 +247,7 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+\n github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=\n github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=\n github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=\n+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=\n github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=\n github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=\n github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=\n@@ -310,6 +311,7 @@ github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIG\n github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=\n github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=\n github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=\n+github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=\n github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=\n github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=\n github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=\n@@ v1.3.0/go.mod +391,13 @@ github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQs\n github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=\n github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=\n github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=\n+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=\n github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=\n github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=\n github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=\n github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=\n github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=\n+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=\n github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=\n github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=\n github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=\n@@ -415,6 +419,7 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:\n github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=\n github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=\n github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=\n+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=\n github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=\n github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=\n github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=\n@@ -668,6 +673,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=\n+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=\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@@ -993,6 +999,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8\n rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=\n rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=\n sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=\n sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=\n sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=\n+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=\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.17\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.18\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\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.17'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n---\ntest/integration/go.mod\n@@ -1,6 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.20\n+go 1.21\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n---\ntest/integration/go.sum\n@@ -247,6 +247,7 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+\n github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=\n github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=\n github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=\n+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=\n github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=\n github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=\n github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=\n@@ -310,6 +311,7 @@ of v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIG\n github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=\n github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=\n github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=\n+github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=\n github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=\n github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=\n github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=\n@@ -389,11 +391,13 @@ github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQs\n github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=\n github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=\n github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=\n+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=\n github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=\n github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=\n github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=\n github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=\n github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=\n+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=\n github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=\n github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=\n github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=\n@@ -415,6 +419,7 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:\n github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=\n github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=\n github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=\n+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=\n github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=\n github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=\n github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=\n@@ -668,6 +673,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=\n+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=\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@@ -993,6 +999,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8\n rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=\n rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=\n sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=\n sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=\n sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=\n+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=\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.17\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.18\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\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.17'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n---\ntest/integration/go.mod\n@@ -1,6 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.20\n+go 1.21\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n---\ntest/integration/go.sum\n@@ -247,6 +247,7 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+\n github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=\n github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=\n github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=\n+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=\n github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=\n github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=\n github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=\n@@ -310,6 +311,7 @@ github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIG\n github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=\n github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=\n github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=\n+github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=\n github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=\n github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=\n github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=\n@@ -389,11 +391,13 @@ github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQs\n github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=\n github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=\n github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=\n+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=\n github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=\n github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=\n github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=\n github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=\n github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=\n+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=\n github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=\n github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=\n github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=\n@@ -415,6 +419,7 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:\n github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=\n github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=\n github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=\n+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=\n +391,13 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=\n github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=\n github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=\n@@ -668,6 +673,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=\n+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=\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@@ -993,6 +999,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8\n rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=\n rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=\n sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=\n sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=\n sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=\n+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=\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.17\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.18\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\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.17'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'\n---\ntest/integration/go.mod\n@@ -1,6 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.20\n+go 1.21\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n---\ntest/integration/go.sum\n@@ -247,6 +247,7 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+\n github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=\n github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=\n github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=\n+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=\n github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=\n github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=\n github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=\n@@ -310,6 +311,7 @@ github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIG\n github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=\n github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=\n github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=\n+github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=\n github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=\n github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=\n github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=\n@@ -389,11 +391,13 @@ github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQs\n github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=\n github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=\n github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=\n+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=\n github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=\n github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=\n github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=\n github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=\n github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=\n+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=\n github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=\n github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=\n github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=\n@@ -415,6 +419,7 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:\n github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=\n github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=\n github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=\n+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=\n github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=\n github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=\n github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=\n@@ -668,6 +673,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn\n golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=\n+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=\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@@ -993,6 +999,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8\n rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=\n rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=\n sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=\n sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=\n sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=\n+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=\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| [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 | `~> 7.0` -> `~> 8.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-network (terraform-google-modules/network/google)</summary>\n\n### [`v8.0.0`](https://togithub.com/terraform-google-modules/terraform-google-network/blob/HEAD/CHANGELOG.md#800-2023-11-04)\n\n[Compare Source](https://togithub.com/terraform-google-modules/terraform-google-network/compare/v7.5.0...v8.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- bumping tf to v1.3 for fabric-net-firewall ([#​515](https://togithub.com/terraform-google-modules/terraform-google-network/issues/515))\n- **deps:** Update Terraform terraform-google-modules/cloud-dns/google to v5 ([#​489](https://togithub.com/terraform-google-modules/terraform-google-network/issues/489))\n\n##### Bug Fixes\n\n- bumping tf to v1.3 for fabric-net-firewall ([#​515](https://togithub.com/terraform-google-modules/terraform-google-network/issues/515)) ([c08ea5f](https://togithub.com/terraform-google-modules/terraform-google-network/commit/c08ea5f269cc845db7c335b30b45c6d5d728029b))\n- **deps:** Update Terraform terraform-google-modules/cloud-dns/google to v5 ([#​489](https://togithub.com/terraform-google-modules/terraform-google-network/issues/489)) ([adb3e2a](https://togithub.com/terraform-google-modules/terraform-google-network/commit/adb3e2adb92dfbcd9792cd1db7df1b048ee7d7cb))\n- network-firewall-policy not able to use target_secure_tags ([#​514](https://togithub.com/terraform-google-modules/terraform-google-network/issues/514)) ([a5418b4](https://togithub.com/terraform-google-modules/terraform-google-network/commit/a5418b40729e6f72b3f3e0c76825381f7aa68d9d))\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40Ni4wIiwidXBkYXRlZEluVmVyIjoiMzcuODEuMyIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n network_name = \"my-custom-mode-network\"\n mtu peer_network = 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 = \"~> 7.0\"\n+ version = \"~> 8.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@@ -40,7 +40,7 @@ module \"test-vpc-module\" {\n \n module \"serverless-connector\" {\n source = \"terraform-google-modules/network/google//modules/vpc-serverless-connector-beta\"\n- version = \"~> 7.0\"\n+ version = \"~> 8.0\"\n project_id = var.project_id\n vpc_connectors = [{\n name = \"central-serverless\"\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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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@@ -40,7 +40,7 @@ module \"test-vpc-module\" {\n \n module \"serverless-connector\" {\n source = \"terraform-google-modules/network/google//modules/vpc-serverless-connector-beta\"\n- version = \"~> 7.0\"\n+ version = \"~> 8.0\"\n project_id = var.project_id\n vpc_connectors = [{\n name = \"central-serverless\"\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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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@@ -40,7 +40,7 @@ module \"test-vpc-module\" {\n \n module \"serverless-connector\" {\n source = \"terraform-google-modules/network/google//modules/vpc-serverless-connector-beta\"\n- = = \"~> 7.0\"\n+ version = \"~> 8.0\"\n project_id = var.project_id\n vpc_connectors = [{\n name = \"central-serverless\"\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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> 8.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 = \"~> 7.0\"\n+ version = \"~> version 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 = \"~> 7.0\"\n+ version = \"~> 8.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@@ -40,7 +40,7 @@ module \"test-vpc-module\" {\n \n module \"serverless-connector\" {\n source = \"terraform-google-modules/network/google//modules/vpc-serverless-connector-beta\"\n- version = \"~> 7.0\"\n+ version = \"~> 8.0\"\n project_id = var.project_id\n vpc_connectors = [{\n name = \"central-serverless\"\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| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit) | require | minor | `v0.9.2` -> `v0.10.1` |\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.46.1` -> `v0.46.7` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.46.7`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.7)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.46.6...v0.46.7)\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- `http-helper`\n\n#### Description\n\n- Added handling for `nil` body in `http-helper`.\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- [@​semihbkgr](https://togithub.com/semihbkgr)\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/1370](https://togithub.com/gruntwork-io/terratest/pull/1370)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.46.6`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.6)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.46.5...v0.46.6)\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- `helm`\n\n#### Description\n\n- Added support for the `--repo options` to the helm test feature\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- [@​jguionnet](https://togithub.com/jguionnet)\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/1365](https://togithub.com/gruntwork-io/terratest/pull/1365)\n- [https://github.com/gruntwork-io/terratest/pull/1368](https://togithub.com/gruntwork-io/terratest/pull/1368)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.46.5`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.5)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.46.4...v0.46.5)\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#### Description\n\n- Added `RestConfig` field to extend auth options for Kubernetes client.\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- [@​kirecek](https://togithub.com/kirecek)\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/1354](https://togithub.com/gruntwork-io/terratest/pull/1354)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.46.4`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.4)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.46.3...v0.46.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<!-- 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/docker/docker` from `20.10.7+incompatible` to `24.0.7+incompatible`\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/1362](https://togithub.com/gruntwork-io/terratest/pull/1362)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.46.3`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.3)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.46.2...v0.46.3)\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 `google.golang.org/grpc` from `1.51.0` to `1.56.3`\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/1360](https://togithub.com/gruntwork-io/terratest/pull/1360)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.46.2`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.2)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.46.1...v0.46.2)\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/docker/distribution` from `2.7.1+incompatible` to `2.8.2+incompatible`\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/1286](https://togithub.com/gruntwork-io/terratest/pull/1286)\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40Ni4wIiwidXBkYXRlZEluVmVyIjoiMzcuNTkuOCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2\n-\tgithub.com/gruntwork-io/terratest v0.46.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n+\tgithub.com/gruntwork-io/terratest v0.46.7\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n@@ -59,7 +59,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.14.0 // indirect\n-\tgolang.org/x/mod v0.13.0 // indirect\n+\tgolang.org/x/mod v0.14.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2 h1:7fdp02N9fd8itrSe/p7njaSKAUYJGgxn8ajgZfbFK+I=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2/go.mod h1:yyde2qkA+GhCou8exSJwifnJlAcWCNcU1vs911CEOJg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1 h1:eOqSlege+69h9JhR/ydpHCBLCfQmJuznPGdhLY/SDcU=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1/go.mod h1:R0AXqSshPDVYHGopYGwPxguApNpFFOdaVAJ8XO2BxJ0=\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@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.1 h1:dJ/y2/Li6yCDIc8KXY8PfydtrMRiXFb3UZm4LoPShPI=\n-github.com/gruntwork-io/terratest v0.46.1/go.mod h1:gl//tb5cLnbpQs1FTSNwhsrbhsoG00goCJPfOnyliiU=\n+github.com/gruntwork-io/terratest v0.46.7 h1:oqGPBBO87SEsvBYaA0R5xOq+Lm2Xc5dmFVfxEolfZeU=\n+github.com/gruntwork-io/terratest v0.46.7/go.mod h1:6gI5MlLeyF+SLwqocA5GBzcTix+XiuxCy1BPwKuT+WM=\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@@ -505,8 +505,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=\n-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=\n+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2\n-\tgithub.com/gruntwork-io/terratest v0.46.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n+\tgithub.com/gruntwork-io/terratest v0.46.7\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n@@ -59,7 +59,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.14.0 // indirect\n-\tgolang.org/x/mod v0.13.0 // indirect\n+\tgolang.org/x/mod v0.14.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test @@ h1:7fdp02N9fd8itrSe/p7njaSKAUYJGgxn8ajgZfbFK+I=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2/go.mod h1:yyde2qkA+GhCou8exSJwifnJlAcWCNcU1vs911CEOJg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1 h1:eOqSlege+69h9JhR/ydpHCBLCfQmJuznPGdhLY/SDcU=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1/go.mod h1:R0AXqSshPDVYHGopYGwPxguApNpFFOdaVAJ8XO2BxJ0=\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@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.1 h1:dJ/y2/Li6yCDIc8KXY8PfydtrMRiXFb3UZm4LoPShPI=\n-github.com/gruntwork-io/terratest v0.46.1/go.mod h1:gl//tb5cLnbpQs1FTSNwhsrbhsoG00goCJPfOnyliiU=\n+github.com/gruntwork-io/terratest v0.46.7 h1:oqGPBBO87SEsvBYaA0R5xOq+Lm2Xc5dmFVfxEolfZeU=\n+github.com/gruntwork-io/terratest v0.46.7/go.mod h1:6gI5MlLeyF+SLwqocA5GBzcTix+XiuxCy1BPwKuT+WM=\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@@ -505,8 +505,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=\n-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=\n+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2\n-\tgithub.com/gruntwork-io/terratest v0.46.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n+\tgithub.com/gruntwork-io/terratest v0.46.7\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n@@ -59,7 +59,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.14.0 // indirect\n-\tgolang.org/x/mod v0.13.0 // indirect\n+\tgolang.org/x/mod v0.14.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2 h1:7fdp02N9fd8itrSe/p7njaSKAUYJGgxn8ajgZfbFK+I=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2/go.mod h1:yyde2qkA+GhCou8exSJwifnJlAcWCNcU1vs911CEOJg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1 h1:eOqSlege+69h9JhR/ydpHCBLCfQmJuznPGdhLY/SDcU=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1/go.mod h1:R0AXqSshPDVYHGopYGwPxguApNpFFOdaVAJ8XO2BxJ0=\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@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.1 h1:dJ/y2/Li6yCDIc8KXY8PfydtrMRiXFb3UZm4LoPShPI=\n-github.com/gruntwork-io/terratest v0.46.1/go.mod h1:gl//tb5cLnbpQs1FTSNwhsrbhsoG00goCJPfOnyliiU=\n+github.com/gruntwork-io/terratest v0.46.7 h1:oqGPBBO87SEsvBYaA0R5xOq+Lm2Xc5dmFVfxEolfZeU=\n+github.com/gruntwork-io/terratest v0.46.7/go.mod h1:6gI5MlLeyF+SLwqocA5GBzcTix+XiuxCy1BPwKuT+WM=\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@@ -505,8 +505,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=\n-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=\n+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\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.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2\n-\tgithub.com/gruntwork-io/terratest v0.46.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1\n+\tgithub.com/gruntwork-io/terratest v0.46.7\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n@@ -59,7 +59,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.14.0 // indirect\n-\tgolang.org/x/mod v0.13.0 // indirect\n+\tgolang.org/x/mod v0.14.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v1.2.2/go.mod // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2 h1:7fdp02N9fd8itrSe/p7njaSKAUYJGgxn8ajgZfbFK+I=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2/go.mod h1:yyde2qkA+GhCou8exSJwifnJlAcWCNcU1vs911CEOJg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1 h1:eOqSlege+69h9JhR/ydpHCBLCfQmJuznPGdhLY/SDcU=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.10.1/go.mod h1:R0AXqSshPDVYHGopYGwPxguApNpFFOdaVAJ8XO2BxJ0=\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@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.1 h1:dJ/y2/Li6yCDIc8KXY8PfydtrMRiXFb3UZm4LoPShPI=\n-github.com/gruntwork-io/terratest v0.46.1/go.mod h1:gl//tb5cLnbpQs1FTSNwhsrbhsoG00goCJPfOnyliiU=\n+github.com/gruntwork-io/terratest v0.46.7 h1:oqGPBBO87SEsvBYaA0R5xOq+Lm2Xc5dmFVfxEolfZeU=\n+github.com/gruntwork-io/terratest v0.46.7/go.mod h1:6gI5MlLeyF+SLwqocA5GBzcTix+XiuxCy1BPwKuT+WM=\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@@ -505,8 +505,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=\n-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=\n+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n---\n\n\n---\n"
}
] |
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 | patch | `1.20` -> `1.20.11` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.20.11`](https://togithub.com/golang/go/compare/go1.20.10...go1.20.11)\n\n### [`v1.20.10`](https://togithub.com/golang/go/compare/go1.20.9...go1.20.10)\n\n### [`v1.20.9`](https://togithub.com/golang/go/compare/go1.20.8...go1.20.9)\n\n### [`v1.20.8`](https://togithub.com/golang/go/compare/go1.20.7...go1.20.8)\n\n### [`v1.20.7`](https://togithub.com/golang/go/compare/go1.20.6...go1.20.7)\n\n### [`v1.20.6`](https://togithub.com/golang/go/compare/go1.20.5...go1.20.6)\n\n### [`v1.20.5`](https://togithub.com/golang/go/compare/go1.20.4...go1.20.5)\n\n### [`v1.20.4`](https://togithub.com/golang/go/compare/go1.20.3...go1.20.4)\n\n### [`v1.20.3`](https://togithub.com/golang/go/compare/go1.20.2...go1.20.3)\n\n### [`v1.20.2`](https://togithub.com/golang/go/compare/go1.20.1...go1.20.2)\n\n### [`v1.20.1`](https://togithub.com/golang/go/compare/go1.20...go1.20.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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40Ni4wIiwidXBkYXRlZEluVmVyIjoiMzcuNDYuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -1,6 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.20\n+go 1.20.11\n github.com/terraform-google-modules/terraform-google-network/test/integration\n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -1,6 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.20\n+go @@\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -1,6 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.20\n+go 1.20.11\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -1,6 +1,6 @@\n module +1,6 \n-go 1.20\n+go 1.20.11\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2\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 | Update | Change |\n|---|---|---|\n| cft/developer-tools | minor | `1.14` -> `1.17` |\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi44My4wIiwidXBkYXRlZEluVmVyIjoiMzcuMzEuNSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.14\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - use substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'\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.14'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'\n---\nmodules/vpc/outputs.tf\n@@ -35,6 +35,6 @@ output \"network_self_link\" {\n }\n \n output \"project_id\" {\n- value = var.shared_vpc_host && length(google_compute_shared_vpc_host_project.shared_vpc_host) > 0 ? google_compute_shared_vpc_host_project.shared_vpc_host.*.project[0] : google_compute_network.network.project\n+ value = var.shared_vpc_host && length(google_compute_shared_vpc_host_project.shared_vpc_host) > 0 ? google_compute_shared_vpc_host_project.shared_vpc_host[0].project : google_compute_network.network.project\n description = \"VPC project id\"\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.14\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'\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.14'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'\n---\nmodules/vpc/outputs.tf\n@@ -35,6 +35,6 @@ output \"network_self_link\" {\n }\n \n output \"project_id\" {\n- value = var.shared_vpc_host && length(google_compute_shared_vpc_host_project.shared_vpc_host) > 0 ? google_compute_shared_vpc_host_project.shared_vpc_host.*.project[0] : google_compute_network.network.project\n+ value = var.shared_vpc_host && length(google_compute_shared_vpc_host_project.shared_vpc_host) > 0 ? google_compute_shared_vpc_host_project.shared_vpc_host[0].project : google_compute_network.network.project\n description = \"VPC project id\"\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.14\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: @@ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'\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.14'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'\n---\nmodules/vpc/outputs.tf\n@@ -35,6 +35,6 @@ output \"network_self_link\" {\n }\n \n output \"project_id\" {\n- value = var.shared_vpc_host && length(google_compute_shared_vpc_host_project.shared_vpc_host) > 0 ? google_compute_shared_vpc_host_project.shared_vpc_host.*.project[0] : google_compute_network.network.project\n+ value = var.shared_vpc_host && length(google_compute_shared_vpc_host_project.shared_vpc_host) > 0 ? google_compute_shared_vpc_host_project.shared_vpc_host[0].project : google_compute_network.network.project\n description = \"VPC project id\"\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.14\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n '1.14'\n+ 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'\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.14'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'\n---\nmodules/vpc/outputs.tf\n@@ -35,6 +35,6 @@ output \"network_self_link\" {\n }\n \n output \"project_id\" {\n- value = var.shared_vpc_host && length(google_compute_shared_vpc_host_project.shared_vpc_host) > 0 ? google_compute_shared_vpc_host_project.shared_vpc_host.*.project[0] : google_compute_network.network.project\n+ value = var.shared_vpc_host && length(google_compute_shared_vpc_host_project.shared_vpc_host) > 0 ? google_compute_shared_vpc_host_project.shared_vpc_host[0].project : google_compute_network.network.project\n description = \"VPC project id\"\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:\nmodules/fabric-net-firewall/versions.tf\n@@ -15,8 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n-\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\n\n\n---\n\nChoice B:\nmodules/fabric-net-firewall/versions.tf\n@@ -15,8 +15,7 @@\n */\n \n terraform {\n- required_version \">= 0.13.0\"\n-\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\n---\n\n\n---\n\nChoice C:\nmodules/fabric-net-firewall/versions.tf\n@@ -15,8 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n-\n+ required_version = \">= 1.3\"\n required_providers {\n google = source = \"hashicorp/google\"\n---\n\n\n---\n\nChoice D:\nmodules/fabric-net-firewall/versions.tf\n@@ -15,8 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n-\n+ required_version = \">= 1.3\"\n required_providers {\n google = {\n source = \"hashicorp/google\"\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/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit) | require | patch | `v0.9.1` -> `v0.9.2` |\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMS41IiwidXBkYXRlZEluVmVyIjoiMzcuMzEuNSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2\n \tgithub.com/gruntwork-io/terratest v0.46.1\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n@@ -59,7 +59,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.14.0 // indirect\n-\tgolang.org/x/mod v0.12.0 // indirect\n+\tgolang.org/x/mod v0.13.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n@@ -76,5 +76,5 @@ require (\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-20230905202853-d090da108d2f // indirect\n-\tsigs.k8s.io/kustomize/kyaml v0.14.3 // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.15.0 // indirect\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1 h1:GgBjJ6MwjDOS+A14d4neKrhraeGW32EefyzkfrKheXI=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1/go.mod h1:ZWmQ7t9ySG4GNn5CXKWQS8+UX7qkWmQUxSN2iAFEhvE=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2 h1:7fdp02N9fd8itrSe/p7njaSKAUYJGgxn8ajgZfbFK+I=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2/go.mod h1:yyde2qkA+GhCou8exSJwifnJlAcWCNcU1vs911CEOJg=\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@@ -505,8 +505,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=\n-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=\n+golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=\n+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n@@ -993,6 +993,6 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8\n rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=\n rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n-sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs=\n-sigs.k8s.io/kustomize/kyaml h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA=\n+sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=\n+sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=\n sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=\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 1.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2\n \tgithub.com/gruntwork-io/terratest v0.46.1\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n@@ -59,7 +59,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.14.0 // indirect\n-\tgolang.org/x/mod v0.12.0 // indirect\n+\tgolang.org/x/mod v0.13.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n@@ -76,5 +76,5 @@ require (\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-20230905202853-d090da108d2f // indirect\n-\tsigs.k8s.io/kustomize/kyaml v0.14.3 // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.15.0 // indirect\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1 h1:GgBjJ6MwjDOS+A14d4neKrhraeGW32EefyzkfrKheXI=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1/go.mod h1:ZWmQ7t9ySG4GNn5CXKWQS8+UX7qkWmQUxSN2iAFEhvE=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2 h1:7fdp02N9fd8itrSe/p7njaSKAUYJGgxn8ajgZfbFK+I=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2/go.mod h1:yyde2qkA+GhCou8exSJwifnJlAcWCNcU1vs911CEOJg=\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@@ -505,8 +505,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=\n-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=\n+golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=\n+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n \tgolang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n@@ -993,6 +993,6 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8\n rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=\n rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n-sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs=\n-sigs.k8s.io/kustomize/kyaml v0.14.3/go.mod h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA=\n+sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=\n+sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=\n sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=\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.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2\n \tgithub.com/gruntwork-io/terratest v0.46.1\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n@@ -59,7 +59,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.14.0 // indirect\n-\tgolang.org/x/mod v0.12.0 // indirect\n+\tgolang.org/x/mod v0.13.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n@@ -76,5 +76,5 @@ require (\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-20230905202853-d090da108d2f // indirect\n-\tsigs.k8s.io/kustomize/kyaml v0.14.3 // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.15.0 // indirect\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1 h1:GgBjJ6MwjDOS+A14d4neKrhraeGW32EefyzkfrKheXI=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1/go.mod h1:ZWmQ7t9ySG4GNn5CXKWQS8+UX7qkWmQUxSN2iAFEhvE=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test golang.org/x/mod h1:7fdp02N9fd8itrSe/p7njaSKAUYJGgxn8ajgZfbFK+I=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2/go.mod h1:yyde2qkA+GhCou8exSJwifnJlAcWCNcU1vs911CEOJg=\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@@ -505,8 +505,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=\n-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=\n+golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=\n+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n@@ -993,6 +993,6 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8\n rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=\n rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n-sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs=\n-sigs.k8s.io/kustomize/kyaml v0.14.3/go.mod h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA=\n+sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=\n+sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=\n sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=\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.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2\n \tgithub.com/gruntwork-io/terratest v0.46.1\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n@@ -59,7 +59,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.14.0 // indirect\n-\tgolang.org/x/mod v0.12.0 // indirect\n+\tgolang.org/x/mod v0.13.0 // indirect\n \tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n@@ -76,5 +76,5 @@ require (\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-20230905202853-d090da108d2f // indirect\n-\tsigs.k8s.io/kustomize/kyaml v0.14.3 // indirect\n+\tsigs.k8s.io/kustomize/kyaml v0.15.0 // indirect\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1 h1:GgBjJ6MwjDOS+A14d4neKrhraeGW32EefyzkfrKheXI=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1/go.mod h1:ZWmQ7t9ySG4GNn5CXKWQS8+UX7qkWmQUxSN2iAFEhvE=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2 h1:7fdp02N9fd8itrSe/p7njaSKAUYJGgxn8ajgZfbFK+I=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.2/go.mod h1:yyde2qkA+GhCou8exSJwifnJlAcWCNcU1vs911CEOJg=\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@@ -505,8 +505,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=\n-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=\n+golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=\n+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n@@ -993,6 +993,6 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8\n rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=\n rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=\n sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=\n-sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs=\n-sigs.k8s.io/kustomize/kyaml v0.14.3/go.mod h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA=\n+sigs.k8s.io/kustomize/kyaml v0.15.0 h1:ynlLMAxDhrY9otSg5GYE2TcIz31XkGZ2Pkj7SdolD84=\n+sigs.k8s.io/kustomize/kyaml v0.15.0/go.mod h1:+uMkBahdU1KNOj78Uta4rrXH+iH7wvg+nW7+GULvREA=\n sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=\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| [terraform-google-modules/cloud-dns/google](https://registry.terraform.io/modules/terraform-google-modules/cloud-dns/google) ([source](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns)) | module | major | `~> 4.1` -> `~> 5.0` | `5.1.1` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-cloud-dns (terraform-google-modules/cloud-dns/google)</summary>\n\n### [`v5.1.0`](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/blob/HEAD/CHANGELOG.md#510-2023-08-24)\n\n[Compare Source](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/compare/v5.0.1...v5.1.0)\n\n##### Features\n\n- add dns response policy sub-module ([#​55](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/issues/55)) ([ce34fe5](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/commit/ce34fe53a5e9532cead7c51969eea23bf69929b0))\n\n### [`v5.0.1`](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/blob/HEAD/CHANGELOG.md#501-2023-07-19)\n\n[Compare Source](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/compare/v5.0.0...v5.0.1)\n\n##### Bug Fixes\n\n- add support for empty networks ([#​53](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/issues/53)) ([54f6504](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/commit/54f6504b9c034afc8a34fccb3db9de26a1dd702b))\n\n### [`v5.0.0`](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/blob/HEAD/CHANGELOG.md#500-2023-04-06)\n\n[Compare Source](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/compare/v4.2.1...v5.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- Increased minimum Google Provider version to 4.40 ([#​47](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/issues/47))\n\n- add cloud logging option for public DNS ([#​47](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/issues/47))\n\n##### Features\n\n- add cloud logging option for public DNS ([#​47](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/issues/47)) ([c441d5c](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/commit/c441d5c2d623cf590407c870613db77f4e19a6b5))\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi41Ni4wIiwidXBkYXRlZEluVmVyIjoiMzcuMzEuNSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\n\n\n---\n\nChoice A:\nmodules/private-service-connect/dns.tf\n@@ -20,7 +20,7 @@\n \n module \"googleapis\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}apis\"\n@@ -53,7 +53,7 @@ module \"googleapis\" {\n \n module \"gcr\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}gcr\"\n@@ -86,7 +86,7 @@ module \"gcr\" {\n \n module \"pkg_dev\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}pkg-dev\"\n---\n\n\n---\n\nChoice B:\nmodules/private-service-connect/dns.tf\n@@ -20,7 +20,7 @@\n \n module \"googleapis\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}apis\"\n@@ -53,7 +53,7 @@ module \"googleapis\" {\n \n module \"gcr\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}gcr\"\n@@ -86,7 +86,7 @@ module \"gcr\" {\n \n module \"pkg_dev\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}pkg-dev\"\n---\n\n\n---\n\nChoice C:\nmodules/private-service-connect/dns.tf\n@@ -20,7 +20,7 @@\n \n module \"googleapis\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}apis\"\n@@ -53,7 +53,7 @@ module \"googleapis\" {\n \n module \"gcr\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type \"private\"\n name = \"${local.dns_code}gcr\"\n@@ -86,7 +86,7 @@ module \"gcr\" {\n \n module \"pkg_dev\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}pkg-dev\"\n---\n\n\n---\n\nChoice D:\nmodules/private-service-connect/dns.tf\n@@ -20,7 +20,7 @@\n \n module \"googleapis\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}apis\"\n@@ -53,7 +53,7 @@ module \"googleapis\" {\n \n module \"gcr\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}gcr\"\n@@ -86,7 +86,7 @@ module \"gcr\" {\n \n module \"pkg_dev\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}pkg-dev\"\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 [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.58.0 to 1.58.3.\n<details>\n<summary>Release notes</summary>\n<p><em>Sourced from <a href=\"https://github.com/grpc/grpc-go/releases\">google.golang.org/grpc's releases</a>.</em></p>\n<blockquote>\n<h2>Release 1.58.3</h2>\n<h1>Security</h1>\n<ul>\n<li>\n<p>server: prohibit more than MaxConcurrentStreams handlers from running at once (CVE-2023-44487)</p>\n<p>In addition to this change, applications should ensure they do not leave running tasks behind related to the RPC before returning from method handlers, or should enforce appropriate limits on any such work.</p>\n</li>\n</ul>\n<h2>Release 1.58.2</h2>\n<h1>Bug Fixes</h1>\n<ul>\n<li>\n<p>balancer/weighted_round_robin: fix ticker leak on update</p>\n<p>A new ticker is created every time there is an update of addresses or configuration, but was not properly stopped. This change stops the ticker when it is no longer needed.</p>\n</li>\n</ul>\n<h2>Release 1.58.1</h2>\n<h1>Bug Fixes</h1>\n<ul>\n<li>grpc: fix a bug that was decrementing active RPC count too early for streaming RPCs; leading to channel moving to IDLE even though it had open streams</li>\n<li>grpc: fix a bug where transports were not being closed upon channel entering IDLE</li>\n</ul>\n</blockquote>\n</details>\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/grpc/grpc-go/commit/bf05b9558c16677e362d231120f8213eb276d406\"><code>bf05b95</code></a> Change version.go to v1.58.3 (<a href=\"https://redirect.github.com/grpc/grpc-go/issues/6707\">#6707</a>)</li>\n<li><a href=\"https://github.com/grpc/grpc-go/commit/c40c9ba315aaaa58eb4dc74ba9d8bbc5058f1dfa\"><code>c40c9ba</code></a> server: prohibit more than MaxConcurrentStreams handlers from running at once...</li>\n<li><a href=\"https://github.com/grpc/grpc-go/commit/dd9270d663c346b82341f7f51c4cded2bba5a653\"><code>dd9270d</code></a> update version to 1.58.3-dev (<a href=\"https://redirect.github.com/grpc/grpc-go/issues/6656\">#6656</a>)</li>\n<li><a href=\"https://github.com/grpc/grpc-go/commit/c0aa20a8ac825f86edd59b2cab842de6da77a841\"><code>c0aa20a</code></a> Change version to 1.58.2 (<a href=\"https://redirect.github.com/grpc/grpc-go/issues/6654\">#6654</a>)</li>\n<li><a href=\"https://github.com/grpc/grpc-go/commit/67a53a6b8939aeecb3039053ed503f1f235bb225\"><code>67a53a6</code></a> balancer/weightedroundrobin: fix ticker leak on update (<a href=\"https://redirect.github.com/grpc/grpc-go/issues/6655\">#6655</a>)</li>\n<li><a href=\"https://github.com/grpc/grpc-go/commit/863de7347326bdca22f6084e3ae28e8fa96d01ca\"><code>863de73</code></a> update version to 1.58.2-dev (<a href=\"https://redirect.github.com/grpc/grpc-go/issues/6633\">#6633</a>)</li>\n<li><a href=\"https://github.com/grpc/grpc-go/commit/62726d4336c675cb45b65cded43838a85f1cbc25\"><code>62726d4</code></a> update version to 1.58.1 (<a href=\"https://redirect.github.com/grpc/grpc-go/issues/6629\">#6629</a>)</li>\n<li><a href=\"https://github.com/grpc/grpc-go/commit/fa6d9abecbece2f326e7d91084bf3654bb87a42d\"><code>fa6d9ab</code></a> cherry-pick 6610 and 6620 (<a href=\"https://redirect.github.com/grpc/grpc-go/issues/6627\">#6627</a>)</li>\n<li><a href=\"https://github.com/grpc/grpc-go/commit/467fbf2a55aaae1e88ca313a7e0571f88c910cb6\"><code>467fbf2</code></a> Change version to 1.58.1-dev (<a href=\"https://redirect.github.com/grpc/grpc-go/issues/6580\">#6580</a>)</li>\n<li>See full diff in <a href=\"https://github.com/grpc/grpc-go/compare/v1.58.0...v1.58.3\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/terraform-google-modules/terraform-google-network/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -71,7 +71,7 @@ require (\n \tgoogle.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect\n-\tgoogle.golang.org/grpc v1.58.0 // indirect\n+\tgoogle.golang.org/grpc v1.58.3 // indirect\n \tgoogle.golang.org/protobuf v1.31.0 // indirect\n \tgopkg.in/yaml.v2 v2.4.0 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n---\ntest/integration/go.sum\n@@ -946,8 +946,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu\n google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=\n google.golang.org/grpc \tgopkg.in/yaml.v2 h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=\n google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=\n-google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o=\n-google.golang.org/grpc v1.58.0/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=\n+google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=\n+google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=\n google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=\n google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=\n google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -71,7 +71,7 @@ require (\n \tgoogle.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect\n-\tgoogle.golang.org/grpc v1.58.0 // indirect\n+\tgoogle.golang.org/grpc v1.58.3 // indirect\n \tgoogle.golang.org/protobuf v1.31.0 // indirect\n \tgopkg.in/yaml.v2 v2.4.0 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n---\ntest/integration/go.sum\n@@ -946,8 +946,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu\n google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=\n google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=\n google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=\n-google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o=\n-google.golang.org/grpc v1.58.0/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=\n+google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=\n+google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=\n google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=\n google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=\n google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -71,7 +71,7 @@ require (\n \tgoogle.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect\n-\tgoogle.golang.org/grpc v1.58.0 // indirect\n+\tgoogle.golang.org/grpc v1.58.3 // indirect\n \tgoogle.golang.org/protobuf v1.31.0 // indirect\n \tgopkg.in/yaml.v2 v2.4.0 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n---\ntest/integration/go.sum\n@@ -946,8 +946,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu\n google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=\n google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=\n google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=\n-google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o=\n-google.golang.org/grpc v1.58.0/go.mod indirect\n---\ntest/integration/go.sum\n@@ v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=\n+google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=\n google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=\n google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=\n google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -71,7 +71,7 @@ require (\n \tgoogle.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect\n \tgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect\n-\tgoogle.golang.org/grpc v1.58.0 // indirect\n+\tgoogle.golang.org/grpc v1.58.3 // indirect\n \tgoogle.golang.org/protobuf v1.31.0 // indirect\n \tgopkg.in/yaml.v2 v2.4.0 // indirect\n \tgopkg.in/yaml.v3 v3.0.1 // indirect\n---\ntest/integration/go.sum\n@@ -946,8 +946,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu\n google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=\n google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=\n google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=\n-google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o=\n-google.golang.org/grpc v1.58.0/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=\n+google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=\n+google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=\n google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=\n google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod // google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=\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/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit) | require | patch | `v0.9.0` -> `v0.9.1` | `v0.9.2` |\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.46.0` -> `v0.46.1` | |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.46.1`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.1)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.46.0...v0.46.1)\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.8.0 to 0.17.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/1356](https://togithub.com/gruntwork-io/terratest/pull/1356)\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMS41IiwidXBkYXRlZEluVmVyIjoiMzcuMzEuNSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0\n-\tgithub.com/gruntwork-io/terratest v0.46.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1\n+\tgithub.com/gruntwork-io/terratest v0.46.1\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0 h1:ebMd3XxPg0fufE8E32cGIT4ymbJDT8+AmguE1aNmcxw=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0/go.mod h1:MKce59reXZa9rwYplsr7DBbDIw444JNZvH5hmGEMJTg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1 h1:GgBjJ6MwjDOS+A14d4neKrhraeGW32EefyzkfrKheXI=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1/go.mod h1:ZWmQ7t9ySG4GNn5CXKWQS8+UX7qkWmQUxSN2iAFEhvE=\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@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.0 h1:ezeJ045eOniWO+0T78SFQrVo6tIJ2or/DBtYvJnweOs=\n-github.com/gruntwork-io/terratest v0.46.0/go.mod h1:4TWB5SYgATxJFfg+RNpE0gwiUWxtfMLGOXo5gwcGgMs=\n+github.com/gruntwork-io/terratest v0.46.1 h1:dJ/y2/Li6yCDIc8KXY8PfydtrMRiXFb3UZm4LoPShPI=\n+github.com/gruntwork-io/terratest v0.46.1/go.mod h1:gl//tb5cLnbpQs1FTSNwhsrbhsoG00goCJPfOnyliiU=\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@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0\n-\tgithub.com/gruntwork-io/terratest v0.46.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1\n+\tgithub.com/gruntwork-io/terratest v0.46.1\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0 h1:ebMd3XxPg0fufE8E32cGIT4ymbJDT8+AmguE1aNmcxw=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0/go.mod h1:MKce59reXZa9rwYplsr7DBbDIw444JNZvH5hmGEMJTg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1 h1:GgBjJ6MwjDOS+A14d4neKrhraeGW32EefyzkfrKheXI=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1/go.mod h1:ZWmQ7t9ySG4GNn5CXKWQS8+UX7qkWmQUxSN2iAFEhvE=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n v0.46.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.0 h1:ezeJ045eOniWO+0T78SFQrVo6tIJ2or/DBtYvJnweOs=\n-github.com/gruntwork-io/terratest v0.46.0/go.mod h1:4TWB5SYgATxJFfg+RNpE0gwiUWxtfMLGOXo5gwcGgMs=\n+github.com/gruntwork-io/terratest v0.46.1 h1:dJ/y2/Li6yCDIc8KXY8PfydtrMRiXFb3UZm4LoPShPI=\n+github.com/gruntwork-io/terratest v0.46.1/go.mod h1:gl//tb5cLnbpQs1FTSNwhsrbhsoG00goCJPfOnyliiU=\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:\n-187,8 -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0\n-\tgithub.com/gruntwork-io/terratest v0.46.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1\n+\tgithub.com/gruntwork-io/terratest v0.46.1\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0 h1:ebMd3XxPg0fufE8E32cGIT4ymbJDT8+AmguE1aNmcxw=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0/go.mod h1:MKce59reXZa9rwYplsr7DBbDIw444JNZvH5hmGEMJTg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1 h1:GgBjJ6MwjDOS+A14d4neKrhraeGW32EefyzkfrKheXI=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1/go.mod h1:ZWmQ7t9ySG4GNn5CXKWQS8+UX7qkWmQUxSN2iAFEhvE=\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@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.0 h1:ezeJ045eOniWO+0T78SFQrVo6tIJ2or/DBtYvJnweOs=\n-github.com/gruntwork-io/terratest v0.46.0/go.mod h1:4TWB5SYgATxJFfg+RNpE0gwiUWxtfMLGOXo5gwcGgMs=\n+github.com/gruntwork-io/terratest v0.46.1 h1:dJ/y2/Li6yCDIc8KXY8PfydtrMRiXFb3UZm4LoPShPI=\n+github.com/gruntwork-io/terratest v0.46.1/go.mod h1:gl//tb5cLnbpQs1FTSNwhsrbhsoG00goCJPfOnyliiU=\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@@ -3,8 +3,8 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0\n-\tgithub.com/gruntwork-io/terratest v0.46.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1\n+\tgithub.com/gruntwork-io/terratest v0.46.1\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.17.0\n )\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0 h1:ebMd3XxPg0fufE8E32cGIT4ymbJDT8+AmguE1aNmcxw=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0/go.mod h1:MKce59reXZa9rwYplsr7DBbDIw444JNZvH5hmGEMJTg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1 h1:GgBjJ6MwjDOS+A14d4neKrhraeGW32EefyzkfrKheXI=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.1/go.mod h1:ZWmQ7t9ySG4GNn5CXKWQS8+UX7qkWmQUxSN2iAFEhvE=\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@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.46.0 h1:ezeJ045eOniWO+0T78SFQrVo6tIJ2or/DBtYvJnweOs=\n-github.com/gruntwork-io/terratest v0.46.0/go.mod h1:4TWB5SYgATxJFfg+RNpE0gwiUWxtfMLGOXo5gwcGgMs=\n+github.com/gruntwork-io/terratest v0.46.1 h1:dJ/y2/Li6yCDIc8KXY8PfydtrMRiXFb3UZm4LoPShPI=\n+github.com/gruntwork-io/terratest v0.46.1/go.mod h1:gl//tb5cLnbpQs1FTSNwhsrbhsoG00goCJPfOnyliiU=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap github.com/agext/levenshtein h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/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| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://togithub.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 3.49, < 5.0` -> `>= 3.49, < 5.2` | `5.2.0` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://togithub.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 3.49, < 5.0` -> `>= 3.49, < 5.2` | `5.2.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>hashicorp/terraform-provider-google (google)</summary>\n\n### [`v5.1.0`](https://togithub.com/hashicorp/terraform-provider-google/blob/HEAD/CHANGELOG.md#510-Oct-9-2023)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v5.0.0...v5.1.0)\n\nFEATURES:\n\n- **New Resource:** `google_database_migration_service_private_connection` ([#​16104](https://togithub.com/hashicorp/terraform-provider-google/pull/16104))\n- **New Resource:** `google_edgecontainer_cluster` ([#​16055](https://togithub.com/hashicorp/terraform-provider-google/pull/16055))\n- **New Resource:** `google_edgecontainer_node_pool` ([#​16055](https://togithub.com/hashicorp/terraform-provider-google/pull/16055))\n- **New Resource:** `google_edgecontainer_vpn_connection` ([#​16055](https://togithub.com/hashicorp/terraform-provider-google/pull/16055))\n- **New Resource:** `google_firebase_hosting_custom_domain` ([#​16062](https://togithub.com/hashicorp/terraform-provider-google/pull/16062))\n- **New Resource:** `google_gke_hub_fleet` ([#​16072](https://togithub.com/hashicorp/terraform-provider-google/pull/16072))\n\nIMPROVEMENTS:\n\n- compute: added `device_name` field to `scratch_disk` block of `google_compute_instance` resource ([#​16049](https://togithub.com/hashicorp/terraform-provider-google/pull/16049))\n- container: added `node_config.linux_node_config.cgroup_mode` field to `google_container_node_pool` ([#​16103](https://togithub.com/hashicorp/terraform-provider-google/pull/16103))\n- databasemigrationservice: added support for `oracle` profiles to `google_database_migration_service_connection_profile` ([#​16087](https://togithub.com/hashicorp/terraform-provider-google/pull/16087))\n- firestore: added `api_scope` field to `google_firestore_index` resource ([#​16085](https://togithub.com/hashicorp/terraform-provider-google/pull/16085))\n- gkehub: added `location` field to `google_gke_hub_membership_iam_*` resources ([#​16105](https://togithub.com/hashicorp/terraform-provider-google/pull/16105))\n- gkehub: added `location` field to `google_gke_hub_membership` resource ([#​16105](https://togithub.com/hashicorp/terraform-provider-google/pull/16105))\n- gkeonprem: added update-in-place support for `vcenter` fields in `google_gkeonprem_vmware_cluster` ([#​16073](https://togithub.com/hashicorp/terraform-provider-google/pull/16073))\n- identityplatform: added `sms_region_config` to the resource `google_identity_platform_config` ([#​16044](https://togithub.com/hashicorp/terraform-provider-google/pull/16044))\n\nBUG FIXES:\n\n- dns: fixed record set configuration parsing in `google_dns_record_set` ([#​16042](https://togithub.com/hashicorp/terraform-provider-google/pull/16042))\n- provider: fixed an issue where the plugin-framework implementation of the provider handled default region values that were self-links differently to the SDK implementation. This issue is not believed to have affected users because of downstream functions that turn self links into region names. ([#​16100](https://togithub.com/hashicorp/terraform-provider-google/pull/16100))\n- provider: fixed a bug that caused update requests to be sent for resources with a `terraform_labels` field even if no fields were updated ([#​16111](https://togithub.com/hashicorp/terraform-provider-google/pull/16111))\n\n### [`v5.0.0`](https://togithub.com/hashicorp/terraform-provider-google/blob/HEAD/CHANGELOG.md#500-Oct-2-2023)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google/compare/v4.84.0...v5.0.0)\n\nKNOWN ISSUES:\n\n- Updating some resources post-upgrade results in an error like \"The update_mask in the Update{{Resource}}Request must be set\". This should be resolved in `5.1.0`, see [https://github.com/hashicorp/terraform-provider-google/issues/16091](https://togithub.com/hashicorp/terraform-provider-google/issues/16091) for details.\n\n[Terraform Google Provider 5.0.0 Upgrade Guide](https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/version\\_5\\_upgrade)\n\nNOTES:\n\n- provider: some provider default values are now shown at plan-time ([#​15707](https://togithub.com/hashicorp/terraform-provider-google/pull/15707))\n\nLABELS REWORK:\n\n- provider: default labels configured on the provider through the new `default_labels` field are now supported. The default labels configured on the provider will be applied to all of the resources with standard `labels` field.\n- provider: resources with labels - three label-related fields are now in all of the resources with standard `labels` field. `labels` field is non-authoritative and only manages the labels defined by the users on the resource through Terraform. The new output-only `terraform_labels` field merges the labels defined by the users on the resource through Terraform and the default labels configured on the provider. The new output-only `effective_labels` field lists all of labels present on the resource in GCP, including the labels configured through Terraform, the system, and other clients.\n- provider: resources with annotations - two annotation-related fields are now in all of the resources with standard `annotations` field. The `annotations` field is non-authoritative and only manages the annotations defined by the users on the resource through Terraform. The new output-only `effective_annotations` field lists all of annotations present on the resource in GCP, including the annotations configured through Terraform, the system, and other clients.\n- provider: datasources with labels - three fields `labels`, `terraform_labels`, and `effective_labels` are now present in most resource-based datasources. All three fields have all of labels present on the resource in GCP including the labels configured through Terraform, the system, and other clients, equivalent to `effective_labels` on the resource.\n- provider: datasources with annotations - both `annotations` and `effective_annotations` are now present in most resource-based datasources. Both fields have all of annotations present on the resource in GCP including the annotations configured through Terraform, the system, and other clients, equivalent to `effective_annotations` on the resource.\n\nBREAKING CHANGES:\n\n- provider: added provider-level validation so these fields are not set as empty strings in a user's config: `credentials`, `access_token`, `impersonate_service_account`, `project`, `billing_project`, `region`, `zone` ([#​15968](https://togithub.com/hashicorp/terraform-provider-google/pull/15968))\n- provider: fixed many import functions throughout the provider that matched a subset of the provided input when possible. Now, the GCP resource id supplied to \"terraform import\" must match exactly. ([#​15977](https://togithub.com/hashicorp/terraform-provider-google/pull/15977))\n- provider: made data sources return errors on 404s when applicable instead of silently failing ([#​15799](https://togithub.com/hashicorp/terraform-provider-google/pull/15799))\n- provider: made empty strings in the provider configuration block no longer be ignored when configuring the provider([#​15968](https://togithub.com/hashicorp/terraform-provider-google/pull/15968))\n- accesscontextmanager: changed multiple array fields to sets where appropriate to prevent duplicates and fix diffs caused by server side reordering. ([#​15756](https://togithub.com/hashicorp/terraform-provider-google/pull/15756))\n- bigquery: added more input validations for `google_bigquery_table` schema ([#​15338](https://togithub.com/hashicorp/terraform-provider-google/pull/15338))\n- bigquery: made `routine_type` required for `google_bigquery_routine` ([#​15517](https://togithub.com/hashicorp/terraform-provider-google/pull/15517))\n- cloudfunction2: made `location` required on `google_cloudfunctions2_function` ([#​15830](https://togithub.com/hashicorp/terraform-provider-google/pull/15830))\n- cloudiot: removed deprecated datasource `google_cloudiot_registry_iam_policy` ([#​15739](https://togithub.com/hashicorp/terraform-provider-google/pull/15739))\n- cloudiot: removed deprecated resource `google_cloudiot_device` ([#​15739](https://togithub.com/hashicorp/terraform-provider-google/pull/15739))\n- cloudiot: removed deprecated resource `google_cloudiot_registry` ([#​15739](https://togithub.com/hashicorp/terraform-provider-google/pull/15739))\n- cloudiot: removed deprecated resource `google_cloudiot_registry_iam_*` ([#​15739](https://togithub.com/hashicorp/terraform-provider-google/pull/15739))\n- cloudrunv2: removed deprecated field `liveness_probe.tcp_socket` from `google_cloud_run_v2_service` resource. ([#​15430](https://togithub.com/hashicorp/terraform-provider-google/pull/15430))\n- cloudrunv2: removed deprecated fields `startup_probe` and `liveness_probe` from `google_cloud_run_v2_job` resource. ([#​15430](https://togithub.com/hashicorp/terraform-provider-google/pull/15430))\n- cloudrunv2: retyped `volumes.cloud_sql_instance.instances` to SET from ARRAY for `google_cloud_run_v2_service` ([#​15831](https://togithub.com/hashicorp/terraform-provider-google/pull/15831))\n- compute: made `google_compute_node_group` require one of `initial_size` or `autoscaling_policy` fields configured upon resource creation ([#​16006](https://togithub.com/hashicorp/terraform-provider-google/pull/16006))\n- compute: made `size` in `google_compute_node_group` an output only field. ([#​16006](https://togithub.com/hashicorp/terraform-provider-google/pull/16006))\n- compute: removed default value for `rule.rate_limit_options.encorce_on_key` on resource `google_compute_security_policy` ([#​15681](https://togithub.com/hashicorp/terraform-provider-google/pull/15681))\n- compute: retyped `consumer_accept_lists` to a SET from an ARRAY type for `google_compute_service_attachment` ([#​15985](https://togithub.com/hashicorp/terraform-provider-google/pull/15985))\n- container: added `deletion_protection` to `google_container_cluster` which is enabled to `true` by default. When enabled, this field prevents Terraform from deleting the resource. ([#​16013](https://togithub.com/hashicorp/terraform-provider-google/pull/16013))\n- container: changed `management.auto_repair` and `management.auto_upgrade` defaults to true in `google_container_node_pool` ([#​15931](https://togithub.com/hashicorp/terraform-provider-google/pull/15931))\n- container: changed `networking_mode` default to `VPC_NATIVE` for newly created `google_container_cluster` resources ([#​6402](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6402))\n- container: removed `enable_binary_authorization` in `google_container_cluster` ([#​15868](https://togithub.com/hashicorp/terraform-provider-google/pull/15868))\n- container: removed default for `logging_variant` in `google_container_node_pool` ([#​15931](https://togithub.com/hashicorp/terraform-provider-google/pull/15931))\n- container: removed default value in `network_policy.provider` in `google_container_cluster` ([#​15920](https://togithub.com/hashicorp/terraform-provider-google/pull/15920))\n- container: removed the behaviour that `google_container_cluster` will delete the cluster if it's created in an error state. Instead, it will mark the cluster as tainted, allowing manual inspection and intervention. To proceed with deletion, run another `terraform apply`. ([#​15887](https://togithub.com/hashicorp/terraform-provider-google/pull/15887))\n- container: reworked the `taint` field in `google_container_cluster` and `google_container_node_pool` to only manage a subset of taint keys based on those already in state. Most existing resources are unaffected, unless they use `sandbox_config`- see upgrade guide for details. ([#​15959](https://togithub.com/hashicorp/terraform-provider-google/pull/15959))\n- dataplex: removed `data_profile_result` and `data_quality_result` from `google_dataplex_scan` ([#​15505](https://togithub.com/hashicorp/terraform-provider-google/pull/15505))\n- firebase: changed `deletion_policy` default to `DELETE` for `google_firebase_web_app`. ([#​15406](https://togithub.com/hashicorp/terraform-provider-google/pull/15406))\n- firebase: removed `google_firebase_project_location` ([#​15764](https://togithub.com/hashicorp/terraform-provider-google/pull/15764))\n- gameservices: removed Terraform support for `gameservices` ([#​15558](https://togithub.com/hashicorp/terraform-provider-google/pull/15558))\n- logging: changed the default value of `unique_writer_identity` from `false` to `true` in `google_logging_project_sink`. ([#​15743](https://togithub.com/hashicorp/terraform-provider-google/pull/15743))\n- logging: made `growth_factor`, `num_finite_buckets`, and `scale` required for `google_logging_metric` ([#​15680](https://togithub.com/hashicorp/terraform-provider-google/pull/15680))\n- looker: removed `LOOKER_MODELER` as a possible value in `google_looker_instance.platform_edition` ([#​15956](https://togithub.com/hashicorp/terraform-provider-google/pull/15956))\n- monitoring: fixed perma-diffs in `google_monitoring_dashboard.dashboard_json` by suppressing values returned by the API that are not in configuration ([#​16014](https://togithub.com/hashicorp/terraform-provider-google/pull/16014))\n- monitoring: made `labels` immutable in `google_monitoring_metric_descriptor` ([#​15988](https://togithub.com/hashicorp/terraform-provider-google/pull/15988))\n- privateca: removed deprecated fields `config_values`, `pem_certificates` from `google_privateca_certificate` ([#​15537](https://togithub.com/hashicorp/terraform-provider-google/pull/15537))\n- secretmanager: removed `automatic` field in `google_secret_manager_secret` resource ([#​15859](https://togithub.com/hashicorp/terraform-provider-google/pull/15859))\n- servicenetworking: used Create instead of Patch to create `google_service_networking_connection` ([#​15761](https://togithub.com/hashicorp/terraform-provider-google/pull/15761))\n- servicenetworking: used the `deleteConnection` method to delete the resource `google_service_networking_connection` ([#​15934](https://togithub.com/hashicorp/terraform-provider-google/pull/15934))\n\nFEATURES:\n\n- **New Resource:** `google_scc_folder_custom_module` ([#​15979](https://togithub.com/hashicorp/terraform-provider-google/pull/15979))\n- **New Resource:** `google_scc_organization_custom_module` ([#​16012](https://togithub.com/hashicorp/terraform-provider-google/pull/16012))\n\nIMPROVEMENTS:\n\n- alloydb: added additional fields to `google_alloydb_instance` and `google_alloydb_backup` ([#​15973](https://togithub.com/hashicorp/terraform-provider-google/pull/15974))\n- artifactregistry: added support for remote APT and YUM repositories to `google_artifact_registry_repository` ([#​15973](https://togithub.com/hashicorp/terraform-provider-google/pull/15973))\n- baremetal: made delete a noop for the resource `google_bare_metal_admin_cluster` to better align with actual behavior ([#​16010](https://togithub.com/hashicorp/terraform-provider-google/pull/16010))\n- bigtable: added `state` output attribute to `google_bigtable_instance` clusters ([#​15961](https://togithub.com/hashicorp/terraform-provider-google/pull/15961))\n- compute: made `google_compute_node_group` mutable ([#​16006](https://togithub.com/hashicorp/terraform-provider-google/pull/16006))\n- container: added the `effective_taints` attribute to `google_container_cluster` and `google_container_node_pool`, outputting all known taint values ([#​15959](https://togithub.com/hashicorp/terraform-provider-google/pull/15959))\n- container: allowed setting `addons_config.gcs_fuse_csi_driver_config` on `google_container_cluster` with `enable_autopilot: true`. ([#​15996](https://togithub.com/hashicorp/terraform-provider-google/pull/15996))\n- containeraws: added `binary_authorization` to `google_container_aws_cluster` ([#​15989](https://togithub.com/hashicorp/terraform-provider-google/pull/15989))\n- containeraws: added `update_settings` to `google_container_aws_node_pool` ([#​15989](https://togithub.com/hashicorp/terraform-provider-google/pull/15989))\n- google_compute_instance ([#​15933](https://togithub.com/hashicorp/terraform-provider-google/pull/15933))\n- osconfig: added `week_day_of_month.day_offset` field to the `google_os_config_patch_deployment` resource ([#​15997](https://togithub.com/hashicorp/terraform-provider-google/pull/15997))\n- secretmanager: allowed update for `rotation.rotation_period` field in `google_secret_manager_secret` resource ([#​15952](https://togithub.com/hashicorp/terraform-provider-google/pull/15952))\n- sql: added `preferred_zone` field to `google_sql_database_instance` resource ([#​15971](https://togithub.com/hashicorp/terraform-provider-google/pull/15971))\n- storagetransfer: added `event_stream` field to `google_storage_transfer_job` resource ([#​16004](https://togithub.com/hashicorp/terraform-provider-google/pull/16004))\n\nBUG FIXES:\n\n- bigquery: fixed diff suppression in `external_data_configuration.connection_id` in `google_bigquery_table` ([#​15983](https://togithub.com/hashicorp/terraform-provider-google/pull/15983))\n- bigquery: fixed view and materialized view creation when schema is specified in `google_bigquery_table` ([#​15442](https://togithub.com/hashicorp/terraform-provider-google/pull/15442))\n- bigtable: avoided re-creation of `google_bigtable_instance` when cluster is still updating and storage type changed ([#​15961](https://togithub.com/hashicorp/terraform-provider-google/pull/15961))\n- bigtable: fixed a bug where dynamically created clusters would incorrectly run into duplication error in `google_bigtable_instance` ([#​15940](https://togithub.com/hashicorp/terraform-provider-google/pull/15940))\n- compute: removed the default value for field ` reconcile_connections ` in resource `google_compute_service_attachment`, the field will now default to a value returned by the API when not set in configuration ([#​15919](https://togithub.com/hashicorp/terraform-provider-google/pull/15919))\n- compute: replaced incorrect default value for `enable_endpoint_independent_mapping` with APIs default in resource `google_compute_router_nat` ([#​15478](https://togithub.com/hashicorp/terraform-provider-google/pull/15478))\n- container: fixed an issue in `google_container_node_pool` where empty `linux_node_config.sysctls` would crash the provider ([#​15941](https://togithub.com/hashicorp/terraform-provider-google/pull/15941))\n- dataflow: fixed issue causing error message when max_workers and num_workers were supplied via parameters in `google_dataflow_flex_template_job` ([#​15976](https://togithub.com/hashicorp/terraform-provider-google/pull/15976))\n- dataflow: fixed max_workers read value permanently displaying as 0 in `google_dataflow_flex_template_job` ([#​15976](https://togithub.com/hashicorp/terraform-provider-google/pull/15976))\n- dataflow: fixed permadiff when SdkPipeline values are supplied via parameters in `google_dataflow_flex_template_job` ([#​15976](https://togithub.com/hashicorp/terraform-provider-google/pull/15976))\n- identityplayform: fixed a potential perma-diff for `sign_in` in `google_identity_platform_config` resource ([#​15907](https://togithub.com/hashicorp/terraform-provider-google/pull/15907))\n- firebase: made `google_firebase_rules.release` immutable ([#​15989](https://togithub.com/hashicorp/terraform-provider-google/pull/15989))\n- monitoring: fixed an issue where `metadata` was not able to be updated in `google_monitoring_metric_descriptor` ([#​16014](https://togithub.com/hashicorp/terraform-provider-google/pull/16014))\n- monitoring: fixed bug where importing `google_monitoring_notification_channel` failed when no default project was supplied in provider configuration or through environment variables ([#​15929](https://togithub.com/hashicorp/terraform-provider-google/pull/15929))\n- secretmanager: fixed an issue in `google_secretmanager_secret` where replacing `replication.automatic` with `replication.auto` would destroy and recreate the resource ([#​15922](https://togithub.com/hashicorp/terraform-provider-google/pull/15922))\n- sql: fixed diffs when re-ordering existing `database_flags` in `google_sql_database_instance` ([#​15678](https://togithub.com/hashicorp/terraform-provider-google/pull/15678))\n- tags: fixed import failure on `google_tags_tag_binding` ([#​16005](https://togithub.com/hashicorp/terraform-provider-google/pull/16005))\n- vertexai: made `contents_delta_uri` a required field in `google_vertex_ai_index` as omitting it would result in an error ([#​15992](https://togithub.com/hashicorp/terraform-provider-google/pull/15992))\n\n</details>\n\n<details>\n<summary>hashicorp/terraform-provider-google-beta (google-beta)</summary>\n\n### [`v5.1.0`](https://togithub.com/hashicorp/terraform-provider-google-beta/blob/HEAD/CHANGELOG.md#510-Oct-9-2023)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google-beta/compare/v5.0.0...v5.1.0)\n\nFEATURES:\n\n- **New Resource:** `google_database_migration_service_private_connection` ([#​6436](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6436))))\n- **New Resource:** `google_edgecontainer_cluster` ([#​6406](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6406))\n- **New Resource:** `google_edgecontainer_node_pool` ([#​6406](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6406))\n- **New Resource:** `google_edgecontainer_vpn_connection` ([#​6406](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6406))\n- **New Resource:** `google_firebase_hosting_custom_domain` ([#​6409](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6409))\n- **New Resource:** `google_gke_hub_fleet` ([#​6417](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6417))\n\nIMPROVEMENTS:\n\n- compute: added `device_name` field to `scratch_disk` block of `google_compute_instance` resource ([#​6401](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6401))\n- container: added `node_config.linux_node_config.cgroup_mode` field to `google_container_node_pool` ([#​6435](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6435))\n- databasemigrationservice: added support for `oracle` profiles to `google_database_migration_service_connection_profile` ([#​6426](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6426))\n- firestore: added `api_scope` field to `google_firestore_index` resource ([#​6424](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6424))\n- gkehub: added `location` field to `google_gke_hub_membership_iam_*` resources ([#​6437](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6437))\n- gkehub: added `location` field to `google_gke_hub_membership` resource ([#​6437](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6437))\n- gkeonprem: added update-in-place support for `vcenter` fields in `google_gkeonprem_vmware_cluster` ([#​6418](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6418))\n- identityplatform: added `sms_region_config` to the resource `google_identity_platform_config` ([#​6398](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6398))\n\nBUG FIXES:\n\n- dns: fixed record set configuration parsing in `google_dns_record_set` ([#​6397](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6397))\n- provider: fixed an issue where the plugin-framework implementation of the provider handled default region values that were self-links differently to the SDK implementation. This issue is not believed to have affected users because of downstream functions that turn self links into region names. ([#​6432](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6432))\n- provider: fixed a bug that caused update requests to be sent for resources with a `terraform_labels` field even if no fields were updated ([#​6443](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6443))\n\n### [`v5.0.0`](https://togithub.com/hashicorp/terraform-provider-google-beta/blob/HEAD/CHANGELOG.md#500-Oct-2-2023)\n\n[Compare Source](https://togithub.com/hashicorp/terraform-provider-google-beta/compare/v4.84.0...v5.0.0)\n\nKNOWN ISSUES:\n\n- Updating some resources post-upgrade results in an error like \"The update_mask in the Update{{Resource}}Request must be set\". This should be resolved in `5.1.0`, see [https://github.com/hashicorp/terraform-provider-google/issues/16091](https://togithub.com/hashicorp/terraform-provider-google/issues/16091) for details.\n\n[Terraform Google Provider 5.0.0 Upgrade Guide](https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/version\\_5\\_upgrade)\n\nNOTES:\n\n- provider: some provider default values are now shown at plan-time ([#​6188](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6188))\n\nLABELS REWORK:\n\n- provider: default labels configured on the provider through the new `default_labels` field are now supported. The default labels configured on the provider will be applied to all of the resources with standard `labels` field.\n- provider: resources with labels - three label-related fields are now in all of the resources with standard `labels` field. `labels` field is non-authoritative and only manages the labels defined by the users on the resource through Terraform. The new output-only `terraform_labels` field merges the labels defined by the users on the resource through Terraform and the default labels configured on the provider. The new output-only `effective_labels` field lists all of labels present on the resource in GCP, including the labels configured through Terraform, the system, and other clients.\n- provider: resources with annotations - two annotation-related fields are now in all of the resources with standard `annotations` field. The `annotations` field is non-authoritative and only manages the annotations defined by the users on the resource through Terraform. The new output-only `effective_annotations` field lists all of annotations present on the resource in GCP, including the annotations configured through Terraform, the system, and other clients.\n- provider: datasources with labels - three fields `labels`, `terraform_labels`, and `effective_labels` are now present in most resource-based datasources. All three fields have all of labels present on the resource in GCP including the labels configured through Terraform, the system, and other clients, equivalent to `effective_labels` on the resource.\n- provider: datasources with annotations - both `annotations` and `effective_annotations` are now present in most resource-based datasources. Both fields have all of annotations present on the resource in GCP including the annotations configured through Terraform, the system, and other clients, equivalent to `effective_annotations` on the resource.\n\nBREAKING CHANGES:\n\n- provider: added provider-level validation so these fields are not set as empty strings in a user's config: `credentials`, `access_token`, `impersonate_service_account`, `project`, `billing_project`, `region`, `zone` ([#​6358](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6358))\n- provider: fixed many import functions throughout the provider that matched a subset of the provided input when possible. Now, the GCP resource id supplied to \"terraform import\" must match exactly. ([#​6364](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6364))\n- provider: made data sources return errors on 404s when applicable instead of silently failing ([#​6241](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6241))\n- provider: made empty strings in the provider configuration block no longer be ignored when configuring the provider ([#​6358](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6358))\n- accesscontextmanager: changed multiple array fields to sets where appropriate to prevent duplicates and fix diffs caused by server side reordering. ([#​6217](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6217))\n- bigquery: added more input validations for `google_bigquery_table` schema ([#​5975](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/5975))\n- bigquery: made `routine_type` required for `google_bigquery_routine` ([#​6080](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6080))\n- cloudfunction2: made `location` required on `google_cloudfunctions2_function` ([#​6260](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6260))\n- cloudiot: removed deprecated datasource `google_cloudiot_registry_iam_policy` ([#​6206](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6206))\n- cloudiot: removed deprecated resource `google_cloudiot_device` ([#​6206](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6206))\n- cloudiot: removed deprecated resource `google_cloudiot_registry` ([#​6206](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6206))\n- cloudiot: removed deprecated resource `google_cloudiot_registry_iam_*` ([#​6206](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6206))\n- cloudrunv2: removed deprecated field `liveness_probe.tcp_socket` from `google_cloud_run_v2_service` resource. ([#​6029](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6029))\n- cloudrunv2: removed deprecated fields `startup_probe` and `liveness_probe` from `google_cloud_run_v2_job` resource. ([#​6029](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6029))\n- cloudrunv2: retyped `volumes.cloud_sql_instance.instances` to SET from ARRAY for `google_cloud_run_v2_service` ([#​6261](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6261))\n- compute: made `google_compute_node_group` require one of `initial_size` or `autoscaling_policy` fields configured upon resource creation ([#​6384](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6384))\n- compute: made `size` in `google_compute_node_group` an output only field. ([#​6384](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6384))\n- compute: removed default value for `rule.rate_limit_options.encorce_on_key` on resource `google_compute_security_policy` ([#​6174](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6174))\n- compute: retyped `consumer_accept_lists` to a SET from an ARRAY type for `google_compute_service_attachment` ([#​6369](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6369))\n- container: added `deletion_protection` to `google_container_cluster` which is enabled to `true` by default. When enabled, this field prevents Terraform from deleting the resource. ([#​6391](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6391))\n- container: changed `management.auto_repair` and `management.auto_upgrade` defaults to true in `google_container_node_pool` ([#​6329](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6329))\n- container: changed `networking_mode` default to `VPC_NATIVE` for newly created `google_container_cluster` resources ([#​6402](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6402))\n- container: removed `enable_binary_authorization` in `google_container_cluster` ([#​6285](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6285))\n- container: removed default for `logging_variant` in `google_container_node_pool` ([#​6329](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6329))\n- container: removed default value in `network_policy.provider` in `google_container_cluster` ([#​6323](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6323))\n- container: removed the behaviour that `google_container_cluster` will delete the cluster if it's created in an error state. Instead, it will mark the cluster as tainted, allowing manual inspection and intervention. To proceed with deletion, run another `terraform apply`. ([#​6301](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6301))\n- container: reworked the `taint` field in `google_container_cluster` and `google_container_node_pool` to only manage a subset of taint keys based on those already in state. Most existing resources are unaffected, unless they use `sandbox_config`- see upgrade guide for details. ([#​6351](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6351))\n- dataplex: removed `data_profile_result` and `data_quality_result` from `google_dataplex_scan` ([#​6070](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6070))\n- firebase: changed `deletion_policy` default to `DELETE` for `google_firebase_web_app`. ([#​6018](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6018))\n- firebase: removed `google_firebase_project_location` ([#​6223](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6223))\n- gameservices: removed Terraform support for `gameservices` ([#​6112](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6112))\n- logging: changed the default value of `unique_writer_identity` from `false` to `true` in `google_logging_project_sink`. ([#​6210](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6210))\n- logging: made `growth_factor`, `num_finite_buckets`, and `scale` required for `google_logging_metric` ([#​6173](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6173))\n- looker: removed `LOOKER_MODELER` as a possible value in `google_looker_instance.platform_edition` ([#​6349](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6349))\n- monitoring: fixed perma-diffs in `google_monitoring_dashboard.dashboard_json` by suppressing values returned by the API that are not in configuration ([#​6392](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6392))\n- monitoring: made `labels` immutable in `google_monitoring_metric_descriptor` ([#​6372](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6372))\n- privateca: removed deprecated fields `config_values`, `pem_certificates` from `google_privateca_certificate` ([#​6097](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6097))\n- secretmanager: removed `automatic` field in `google_secret_manager_secret` resource ([#​6279](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6279))\n- servicenetworking: used Create instead of Patch to create `google_service_networking_connection` ([#​6222](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6222))\n- servicenetworking: used the `deleteConnection` method to delete the resource `google_service_networking_connection` ([#​6332](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6332))\n\nFEATURES:\n\n- **New Resource:** `google_scc_folder_custom_module` ([#​6367](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6367))\n- **New Resource:** `google_scc_organization_custom_module` ([#​6390](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6390))\n\nIMPROVEMENTS:\n\n- alloydb: added additional fields to `google_alloydb_instance` and `google_alloydb_backup` ([#​6363](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6363))\n- artifactregistry: added support for remote APT and YUM repositories to `google_artifact_registry_repository` ([#​6362](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6362))\n- baremetal: made delete a noop for the resource `google_bare_metal_admin_cluster` to better align with actual behavior ([#​6388](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6388))\n- bigtable: added `state` output attribute to `google_bigtable_instance` clusters ([#​6353](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6353))\n- compute: made `google_compute_node_group` mutable ([#​6384](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6384))\n- compute: added `network_interface.security_policy` field to `google_compute_instance` resource ([#​6343](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6343))\n- compute: added `type` field to `google_compute_router_nat` resource ([#​6331](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6371))\n- compute: added `rules.action.source_nat_active_ranges` and `rules.action.source_nat_drain_ranges` field to `google_compute_router_nat` resource ([#​6331](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6371))\n- compute: added `network_attachment` to `google_compute_instance` ([#​6331](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6331))\n- container: added the `effective_taints` attribute to `google_container_cluster` and `google_container_node_pool`, outputting all known taint values ([#​6351](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6351))\n- container: allowed setting `addons_config.gcs_fuse_csi_driver_config` on `google_container_cluster` with `enable_autopilot: true`. ([#​6378](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6378))\n- containeraws: added `binary_authorization` to `google_container_aws_cluster` ([#​6373](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6373))\n- containeraws: added `update_settings` to `google_container_aws_node_pool` ([#​6373](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6373))\n- osconfig: added `week_day_of_month.day_offset` field to the `google_os_config_patch_deployment` resource ([#​6379](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6379))\n- secretmanager: allowed update for `rotation.rotation_period` field in `google_secret_manager_secret` resource ([#​6345](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6345))\n- sql: added `preferred_zone` field to `google_sql_database_instance` resource ([#​6360](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6360))\n- storagetransfer: added `event_stream` field to `google_storage_transfer_job` resource ([#​6382](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6382))\n- workstations: added `replica_zones`, `service_account_scopes`, and `enable_audit_agent` to `google_workstations_workstation_config` (beta) ([#​6355](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6355))\n\nBUG FIXES:\n\n- bigquery: fixed diff suppression in `external_data_configuration.connection_id` in `google_bigquery_table` ([#​6368](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6368))\n- bigquery: fixed view and materialized view creation when schema is specified in `google_bigquery_table` ([#​6034](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6034))\n- bigtable: avoided re-creation of `google_bigtable_instance` when cluster is still updating and storage type changed ([#​6353](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6353))\n- bigtable: fixed a bug where dynamically created clusters would incorrectly run into duplication error in `google_bigtable_instance` ([#​6338](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6338))\n- compute: added default value to `metric.filter` in the resource `google_compute_autoscaler` (beta) ([#​6082](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6082))\n- compute: removed the default value for field ` reconcile_connections ` in resource `google_compute_service_attachment`, the field will now default to a value returned by the API when not set in configuration ([#​6322](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6322))\n- compute: replaced incorrect default value for `enable_endpoint_independent_mapping` with APIs default in resource `google_compute_router_nat` ([#​6053](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6053))\n- container: fixed an issue in `google_container_node_pool` where empty `linux_node_config.sysctls` would crash the provider ([#​6339](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6339))\n- dataflow: fixed issue causing error message when max_workers and num_workers were supplied via parameters in `google_dataflow_flex_template_job` ([#​6357](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6357))\n- dataflow: fixed max_workers read value permanently displaying as 0 in `google_dataflow_flex_template_job` ([#​6357](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6357))\n- dataflow: fixed permadiff when SdkPipeline values are supplied via parameters in `google_dataflow_flex_template_job` ([#​6357](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6357))\n- firebase: made `google_firebase_rules.release` immutable ([#​6373](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6373))\n- identityplayform: fixed a potential perma-diff for `sign_in` in `google_identity_platform_config` resource ([#​6317](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6317))\n- monitoring: fixed an issue where `metadata` was not able to be updated in `google_monitoring_metric_descriptor` ([#​6372](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6372))\n- monitoring: fixed bug where importing `google_monitoring_notification_channel` failed when no default project was supplied in provider configuration or through environment variables ([#​6327](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6327))\n- secretmanager: fixed an issue in `google_secretmanager_secret` where replacing `replication.automatic` with `replication.auto` would destroy and recreate the resource ([#​6325](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6325))\n- sql: fixed diffs when re-ordering existing `database_flags` in `google_sql_database_instance` ([#​6172](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6172))\n- tags: fixed import failure on `google_tags_tag_binding` ([#​6383](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6383))\n- vertexai: made `contents_delta_uri` a required field in `google_vertex_ai_index` as omitting it would result in an error ([#​6374](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6374))\n- workstations: fixed in-place updates of `host.gce_instance.accelerators` in `google_workstation_config` ([#​6354](https://togithub.com/hashicorp/terraform-provider-google-beta/pull/6354))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy44LjEiLCJ1cGRhdGVkSW5WZXIiOiIzNy4xOS4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->\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, < 5.0\"\n+ version = \">= 3.45, < 5.2\"\n }\n null = {\n version = \"~> 3.0\"\n---\nexamples/global-network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n }\n }\n---\nexamples/regional-network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n }\n \n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.65, <5.0\"\n+ version = \">= 4.65, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.65, <5.0\"\n+ version = \">= 4.65, < 5.2\"\n }\n random = {\n source = \"hashicorp/random\"\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.50, < 5.0\"\n+ version = \">= 3.50, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.50, < 5.0\"\n+ version = \">= 3.50, < 5.2\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0, < 5.0\"\n+ version = \">= 3.0, < 5.2\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62, < 5.0\"\n+ version = \">= 3.62, < 5.2\"\n }\n }\n \n---\ntest/setup/versions.tf\n@@ -19,10 +19,10 @@ terraform {\n \n required_providers {\n google = {\n- version = \">= 3.49, < 5.0\"\n+ version = \">= 3.49, < 5.2\"\n }\n google-beta = {\n- version = \">= 3.49, < 5.0\"\n+ version = \">= 3.49, < 5.2\"\n }\n }\n }\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, < 5.0\"\n+ version = \">= 3.45, < 5.2\"\n }\n null = {\n version = \"~> 3.0\"\n---\nexamples/global-network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n }\n }\n---\nexamples/regional-network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n }\n \n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.65, <5.0\"\n+ version = \">= 4.65, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.65, <5.0\"\n+ version = \">= 4.65, < 5.2\"\n }\n random = {\n source = \"hashicorp/random\"\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.50, < 5.0\"\n+ version = \">= 3.50, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.50, < 5.0\"\n+ version = \">= 3.50, < 5.2\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0, < 5.0\"\n+ version = \">= 3.0, < 5.2\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62, < 5.0\"\n+ version = \">= 3.62, < 5.2\"\n }\n }\n \n---\ntest/setup/versions.tf\n@@ -19,10 +19,10 @@ terraform {\n \n required_providers {\n google = {\n- version = \">= 3.49, < 5.0\"\n+ version = \">= 3.49, < 5.2\"\n }\n google-beta = {\n- version = \">= 3.49, < 5.0\"\n+ version = \">= 3.49, < 5.2\"\n }\n }\n }\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, < 5.0\"\n+ version = \">= 3.45, < 5.2\"\n }\n null = {\n version = \"~> 3.0\"\n---\nexamples/global-network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n }\n }\n---\nexamples/regional-network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n }\n \n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.65, <5.0\"\n+ version = \">= 4.65, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.65, <5.0\"\n+ version = \">= 4.65, < 5.2\"\n }\n random = {\n source = \"hashicorp/random\"\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.50, < 5.0\"\n+ version = \">= 3.50, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.50, < 5.0\"\n+ version = \">= 3.50, < 5.2\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0, < 5.0\"\n+ version = \">= 3.0, < 5.2\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62, < 5.0\"\n+ version = \">= 3.62, < 5.2\"\n }\n }\n \n---\ntest/setup/versions.tf\n@@ -19,10 +19,10 @@ terraform {\n \n required_providers {\n google = {\n- version = \">= 3.49, < 5.0\"\n+ version = \">= 3.49, < 5.2\"\n }\n google-beta = {\n- version = \">= 3.49, < 5.0\"\n+ version = \">= 3.49, < 5.2\"\n }\n }\n }\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, < 5.0\"\n+ version = \">= 3.45, < 5.2\"\n }\n null = {\n version = \"~> 3.0\"\n---\nexamples/global-network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n }\n }\n---\nexamples/regional-network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.64, < 5.0\"\n+ version = \">= 4.64, < 5.2\"\n }\n }\n \n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.65, <5.0\"\n+ version = \">= 4.65, < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.65, <5.0\"\n+ version = \">= 4.65, < 5.2\"\n }\n random = {\n source = \"hashicorp/random\"\n---\nmodules/private-service-connect/versions.tf\n@@ -19,11 +19,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.50, < 5.0\"\n+ version = \">= < 5.2\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.50, < 5.0\"\n+ version = \">= 3.50, < 5.2\"\n }\n }\n \n---\nmodules/routes-beta/versions.tf\n@@ -20,7 +20,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.0, < 5.0\"\n+ version = \">= 3.0, < 5.2\"\n }\n }\n \n---\nmodules/vpc-serverless-connector-beta/versions.tf\n@@ -19,7 +19,7 @@ terraform {\n required_providers {\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 3.62, < 5.0\"\n+ version = \">= 3.62, < 5.2\"\n }\n }\n \n---\ntest/setup/versions.tf\n@@ -19,10 +19,10 @@ terraform {\n \n required_providers {\n google = {\n- version = \">= 3.49, < 5.0\"\n+ version = \">= 3.49, < 5.2\"\n }\n google-beta = {\n- version = \">= 3.49, < 5.0\"\n+ version = \">= 3.49, < 5.2\"\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| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://togithub.com/GoogleCloudPlatform/cloud-foundation-toolkit) | require | minor | `v0.8.1` -> `v0.9.0` |\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | minor | `v0.44.0` -> `v0.46.0` |\n| [github.com/tidwall/gjson](https://togithub.com/tidwall/gjson) | require | minor | `v1.16.0` -> `v1.17.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.46.0`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.46.0)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.45.0...v0.46.0)\n\n#### Modules affected\n\n- `terraform`\n\n#### Description\n\n- Added support for OpenTofu in `terraform` module\n\n##### Migration Guide\n\nSwitching to tofu:\n\n1. Install OpenTofu cli https://github.com/opentofu/opentofu\n2. Apply one of:\n\n- Option 1: Remove `terraform` binary from `PATH`\n- Option 2: use [`TerraformBinary` config](https://togithub.com/gruntwork-io/terratest/blob/master/modules/terraform/options.go#L41) to specify `tofu` executable\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/1352](https://togithub.com/gruntwork-io/terratest/pull/1352)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.45.0`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.45.0)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.44.1...v0.45.0)\n\n#### Description\n\n- Removed Go patch version from `go.mod`\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/1351](https://togithub.com/gruntwork-io/terratest/pull/1351)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.44.1`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.44.1)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.44.0...v0.44.1)\n\n#### Description\n\n- Updated AMI module to support Ubuntu 20.04 and 22.04.\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/1350](https://togithub.com/gruntwork-io/terratest/pull/1350)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n</details>\n\n<details>\n<summary>tidwall/gjson (github.com/tidwall/gjson)</summary>\n\n### [`v1.17.0`](https://togithub.com/tidwall/gjson/compare/v1.16.0...v1.17.0)\n\n[Compare Source](https://togithub.com/tidwall/gjson/compare/v1.16.0...v1.17.0)\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4wLjMiLCJ1cGRhdGVkSW5WZXIiOiIzNy4xOS4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -3,10 +3,10 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1\n-\tgithub.com/gruntwork-io/terratest v0.44.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0\n+\tgithub.com/gruntwork-io/terratest v0.46.0\n \tgithub.com/stretchr/testify v1.8.4\n-\tgithub.com/tidwall/gjson v1.16.0\n+\tgithub.com/tidwall/gjson v1.17.0\n )\n \n require (\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1 h1:erzHPGm9u0JWWTLSHDRcPTV0CnEAVH1QmPoFDlYB/PU=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1/go.mod h1:MKce59reXZa9rwYplsr7DBbDIw444JNZvH5hmGEMJTg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0 h1:ebMd3XxPg0fufE8E32cGIT4ymbJDT8+AmguE1aNmcxw=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0/go.mod h1:MKce59reXZa9rwYplsr7DBbDIw444JNZvH5hmGEMJTg=\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@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.44.0 h1:3k7lglJFAtw77p2HnR5vaZBCBnlHmu3DuLjVyuCZXJ0=\n-github.com/gruntwork-io/terratest v0.44.0/go.mod h1:EAEuzSjvxAzQoJCEQ06bJPTmdC9HikzgvhmxnAYuExM=\n+github.com/gruntwork-io/terratest v0.46.0 h1:ezeJ045eOniWO+0T78SFQrVo6tIJ2or/DBtYvJnweOs=\n+github.com/gruntwork-io/terratest v0.46.0/go.mod h1:4TWB5SYgATxJFfg+RNpE0gwiUWxtfMLGOXo5gwcGgMs=\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@@ -429,8 +429,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o\n github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n-github.com/tidwall/gjson v1.16.0 h1:SyXa+dsSPpUlcwEDuKuEBJEz5vzTvOea+9rjyYodQFg=\n-github.com/tidwall/gjson v1.16.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=\n+github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -3,10 +3,10 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1\n-\tgithub.com/gruntwork-io/terratest v0.44.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0\n+\tgithub.com/gruntwork-io/terratest v0.46.0\n \tgithub.com/stretchr/testify v1.8.4\n-\tgithub.com/tidwall/gjson v1.16.0\n+\tgithub.com/tidwall/gjson v1.17.0\n )\n \n require (\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1 h1:erzHPGm9u0JWWTLSHDRcPTV0CnEAVH1QmPoFDlYB/PU=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1/go.mod h1:MKce59reXZa9rwYplsr7DBbDIw444JNZvH5hmGEMJTg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0 h1:ebMd3XxPg0fufE8E32cGIT4ymbJDT8+AmguE1aNmcxw=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0/go.mod h1:MKce59reXZa9rwYplsr7DBbDIw444JNZvH5hmGEMJTg=\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@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.44.0 h1:3k7lglJFAtw77p2HnR5vaZBCBnlHmu3DuLjVyuCZXJ0=\n-github.com/gruntwork-io/terratest v0.44.0/go.mod h1:EAEuzSjvxAzQoJCEQ06bJPTmdC9HikzgvhmxnAYuExM=\n+github.com/gruntwork-io/terratest v0.46.0 h1:ezeJ045eOniWO+0T78SFQrVo6tIJ2or/DBtYvJnweOs=\n+github.com/gruntwork-io/terratest v0.46.0\n h1:4TWB5SYgATxJFfg+RNpE0gwiUWxtfMLGOXo5gwcGgMs=\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@@ -429,8 +429,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o\n github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n-github.com/tidwall/gjson v1.16.0 h1:SyXa+dsSPpUlcwEDuKuEBJEz5vzTvOea+9rjyYodQFg=\n-github.com/tidwall/gjson v1.16.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=\n+github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -3,10 +3,10 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1\n-\tgithub.com/gruntwork-io/terratest v0.44.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0\n+\tgithub.com/gruntwork-io/terratest v0.46.0\n \tgithub.com/stretchr/testify v1.8.4\n-\tgithub.com/tidwall/gjson v1.16.0\n+\tgithub.com/tidwall/gjson v1.17.0\n )\n \n require (\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1 h1:erzHPGm9u0JWWTLSHDRcPTV0CnEAVH1QmPoFDlYB/PU=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1/go.mod h1:MKce59reXZa9rwYplsr7DBbDIw444JNZvH5hmGEMJTg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0 h1:ebMd3XxPg0fufE8E32cGIT4ymbJDT8+AmguE1aNmcxw=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test +429,8 h1:MKce59reXZa9rwYplsr7DBbDIw444JNZvH5hmGEMJTg=\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@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.44.0 h1:3k7lglJFAtw77p2HnR5vaZBCBnlHmu3DuLjVyuCZXJ0=\n-github.com/gruntwork-io/terratest v0.44.0/go.mod h1:EAEuzSjvxAzQoJCEQ06bJPTmdC9HikzgvhmxnAYuExM=\n+github.com/gruntwork-io/terratest v0.46.0 h1:ezeJ045eOniWO+0T78SFQrVo6tIJ2or/DBtYvJnweOs=\n+github.com/gruntwork-io/terratest v0.46.0/go.mod h1:4TWB5SYgATxJFfg+RNpE0gwiUWxtfMLGOXo5gwcGgMs=\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@@ -429,8 +429,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o\n github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n-github.com/tidwall/gjson v1.16.0 h1:SyXa+dsSPpUlcwEDuKuEBJEz5vzTvOea+9rjyYodQFg=\n-github.com/tidwall/gjson v1.16.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=\n+github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -3,10 +3,10 @@ module github.com/terraform-google-modules/terraform-google-network/test/integra\n go 1.20\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1\n-\tgithub.com/gruntwork-io/terratest v0.44.0\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0\n+\tgithub.com/gruntwork-io/terratest v0.46.0\n \tgithub.com/stretchr/testify v1.8.4\n-\tgithub.com/tidwall/gjson v1.16.0\n+\tgithub.com/tidwall/gjson v1.17.0\n )\n \n require (\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1 h1:erzHPGm9u0JWWTLSHDRcPTV0CnEAVH1QmPoFDlYB/PU=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1/go.mod h1:MKce59reXZa9rwYplsr7DBbDIw444JNZvH5hmGEMJTg=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0 h1:ebMd3XxPg0fufE8E32cGIT4ymbJDT8+AmguE1aNmcxw=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.9.0/go.mod h1:MKce59reXZa9rwYplsr7DBbDIw444JNZvH5hmGEMJTg=\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@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\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.44.0 h1:3k7lglJFAtw77p2HnR5vaZBCBnlHmu3DuLjVyuCZXJ0=\n-github.com/gruntwork-io/terratest v0.44.0/go.mod h1:EAEuzSjvxAzQoJCEQ06bJPTmdC9HikzgvhmxnAYuExM=\n+github.com/gruntwork-io/terratest v0.46.0 h1:ezeJ045eOniWO+0T78SFQrVo6tIJ2or/DBtYvJnweOs=\n+github.com/gruntwork-io/terratest v0.46.0/go.mod h1:4TWB5SYgATxJFfg+RNpE0gwiUWxtfMLGOXo5gwcGgMs=\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@@ -429,8 +429,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o\n github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n-github.com/tidwall/gjson v1.16.0 h1:SyXa+dsSPpUlcwEDuKuEBJEz5vzTvOea+9rjyYodQFg=\n-github.com/tidwall/gjson v1.16.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=\n+github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=\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.15.0 to 0.17.0.\n<details>\n<summary>Commits</summary>\n<ul>\n<li><a href=\"https://github.com/golang/net/commit/b225e7ca6dde1ef5a5ae5ce922861bda011cfabd\"><code>b225e7c</code></a> http2: limit maximum handler goroutines to MaxConcurrentStreams</li>\n<li><a href=\"https://github.com/golang/net/commit/88194ad8ab44a02ea952c169883c3f57db6cf9f4\"><code>88194ad</code></a> go.mod: update golang.org/x dependencies</li>\n<li><a href=\"https://github.com/golang/net/commit/2b60a61f1e4cf3a5ecded0bd7e77ea168289e6de\"><code>2b60a61</code></a> quic: fix several bugs in flow control accounting</li>\n<li><a href=\"https://github.com/golang/net/commit/73d82efb96cacc0c378bc150b56675fc191894b9\"><code>73d82ef</code></a> quic: handle DATA_BLOCKED frames</li>\n<li><a href=\"https://github.com/golang/net/commit/5d5a036a503f8accd748f7453c0162115187be13\"><code>5d5a036</code></a> quic: handle streams moving from the data queue to the meta queue</li>\n<li><a href=\"https://github.com/golang/net/commit/350aad2603e57013fafb1a9e2089a382fe67dc80\"><code>350aad2</code></a> quic: correctly extend peer's flow control window after MAX_DATA</li>\n<li><a href=\"https://github.com/golang/net/commit/21814e71db756f39b69fb1a3e06350fa555a79b1\"><code>21814e7</code></a> quic: validate connection id transport parameters</li>\n<li><a href=\"https://github.com/golang/net/commit/a600b3518eed7a9a4e24380b4b249cb986d9b64d\"><code>a600b35</code></a> quic: avoid redundant MAX_DATA updates</li>\n<li><a href=\"https://github.com/golang/net/commit/ea633599b58dc6a50d33c7f5438edfaa8bc313df\"><code>ea63359</code></a> http2: check stream body is present on read timeout</li>\n<li><a href=\"https://github.com/golang/net/commit/ddd8598e5694aa5e966e44573a53e895f6fa5eb2\"><code>ddd8598</code></a> quic: version negotiation</li>\n<li>Additional commits viewable in <a href=\"https://github.com/golang/net/compare/v0.15.0...v0.17.0\">compare view</a></li>\n</ul>\n</details>\n<br />\n\n\n[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)\n\nDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.\n\n[//]: # (dependabot-automerge-start)\n[//]: # (dependabot-automerge-end)\n\n---\n\n<details>\n<summary>Dependabot commands and options</summary>\n<br />\n\nYou can trigger Dependabot actions by commenting on this PR:\n- `@dependabot rebase` will rebase this PR\n- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it\n- `@dependabot merge` will merge this PR after your CI passes on it\n- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it\n- `@dependabot cancel merge` will cancel a previously requested merge and block automerging\n- `@dependabot reopen` will reopen this PR if it is closed\n- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually\n- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency\n- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)\n- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)\nYou can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/terraform-google-modules/terraform-google-network/network/alerts).\n\n</details>\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -58,12 +58,12 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.13.0 // indirect\n+\tgolang.org/x/crypto v0.14.0 // indirect\n \tgolang.org/x/mod v0.12.0 // indirect\n-\tgolang.org/x/net v0.15.0 // indirect\n+\tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n-\tgolang.org/x/sys v0.12.0 // indirect\n+\tgolang.org/x/sys v0.13.0 // indirect\n \tgolang.org/x/text v0.13.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n---\ntest/integration/go.sum\n@@ -467,8 +467,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U\n golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=\n golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=\n-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=\n+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=\n+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=\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@@ -554,8 +554,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug\n golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=\n-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=\n-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=\n+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=\n+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=\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@@ -662,12 +662,12 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc\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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=\n-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=\n+golang.org/x/sys v0.13.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-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=\n+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=\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---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -58,12 +58,12 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.13.0 // indirect\n+\tgolang.org/x/crypto v0.14.0 // indirect\n h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=\n v0.12.0 // indirect\n-\tgolang.org/x/net v0.15.0 // indirect\n+\tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n-\tgolang.org/x/sys v0.12.0 // indirect\n+\tgolang.org/x/sys v0.13.0 // indirect\n \tgolang.org/x/text v0.13.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n---\ntest/integration/go.sum\n@@ -467,8 +467,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U\n golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=\n golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=\n-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=\n+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=\n+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=\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@@ -554,8 +554,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug\n golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=\n-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=\n-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=\n+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=\n+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=\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@@ -662,12 +662,12 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc\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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=\n-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=\n+golang.org/x/sys v0.13.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-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=\n+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=\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---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -58,12 +58,12 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.13.0 // v0.12.0 v0.14.0 // indirect\n \tgolang.org/x/mod v0.12.0 // indirect\n-\tgolang.org/x/net v0.15.0 // indirect\n+\tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n-\tgolang.org/x/sys v0.12.0 // indirect\n+\tgolang.org/x/sys v0.13.0 // indirect\n \tgolang.org/x/text v0.13.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n---\ntest/integration/go.sum\n@@ -467,8 +467,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U\n golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=\n golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=\n-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=\n+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=\n+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=\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@@ -554,8 +554,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug\n golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=\n-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=\n-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=\n+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=\n+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=\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@@ -662,12 +662,12 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc\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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=\n-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=\n+golang.org/x/sys v0.13.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-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=\n+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=\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---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -58,12 +58,12 @@ require (\n \tgithub.com/ulikunitz/xz v0.5.11 // indirect\n \tgithub.com/zclconf/go-cty v1.14.0 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n-\tgolang.org/x/crypto v0.13.0 // indirect\n+\tgolang.org/x/crypto v0.14.0 // indirect\n \tgolang.org/x/mod v0.12.0 // indirect\n-\tgolang.org/x/net v0.15.0 // indirect\n+\tgolang.org/x/net v0.17.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.3.0 // indirect\n-\tgolang.org/x/sys v0.12.0 // indirect\n+\tgolang.org/x/sys v0.13.0 // indirect\n \tgolang.org/x/text v0.13.0 // indirect\n \tgolang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect\n \tgoogle.golang.org/api v0.138.0 // indirect\n---\ntest/integration/go.sum\n@@ -467,8 +467,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U\n golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=\n golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=\n golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=\n-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=\n-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=\n+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=\n+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=\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@@ -554,8 +554,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug\n golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=\n golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=\n-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=\n-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=\n+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=\n+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=\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@@ -662,12 +662,12 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc\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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=\n-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=\n+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=\n golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod require golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=\n-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=\n+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=\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---\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* remove usage of `rules` variable in network module for the firewall part to use the newest variables: `ingress_rules` and `egress_rules`\r\n\r\nThis PR will contain a breaking changes and users will have to replace the `rules` field in the `firewall_rules` variable to remove `ranges` property and replace it with `source_ranges` or `destination_ranges`\n\n---\n\nChoice A:\nREADME.md\n@@ -116,6 +116,8 @@ Then perform the following commands on the root folder:\n \n | Name | Description |\n |------|-------------|\n+| egress\\_rules | n/a |\n+| ingress\\_rules | n/a |\n | network | The created network |\n | network\\_id | The ID of the VPC being created |\n | network\\_name | The name of the VPC being created |\n---\nmain.tf\n@@ -55,27 +55,46 @@ module \"routes\" {\n \tFirewall rules\n *****************************************/\n locals {\n- rules = [\n+ ingress_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_ranges = lookup(f, \"source_ranges\", null)\n+ destination_ranges = lookup(f, \"destination_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- }\n+ } if f.direction == \"INGRESS\"\n+ ]\n+ egress_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+ source_ranges = lookup(f, \"source_ranges\", null)\n+ destination_ranges = lookup(f, \"destination_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+ } if f.direction == \"EGRESS\"\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-}\n+ source = \"./modules/firewall-rules\"\n+ project_id = var.project_id\n+ network_name = module.vpc.network_name\n+ ingress_rules = local.ingress_rules\n+ egress_rules = local.egress_rules\n+}\n\\ No newline at end of file\n---\noutputs.tf\n@@ -88,3 +88,11 @@ output \"route_names\" {\n value = [for route in module.routes.routes : route.name]\n description = \"The route names associated with this VPC\"\n }\n+\n+\n+output \"ingress_rules\" {\n+ value = local.ingress_rules\n+}\n+output \"egress_rules\" {\n+ value = local.egress_rules\n+}\n\\ No newline at end of file\n---\n\n\n---\n\nChoice B:\nREADME.md\n@@ -116,6 +116,8 @@ Then perform the following commands on the root folder:\n \n | Name | Description |\n |------|-------------|\n+| egress\\_rules | n/a |\n+| ingress\\_rules | n/a |\n | network | The created network |\n | network\\_id | The ID of the VPC being created |\n | network\\_name | The name of the VPC being created |\n---\nmain.tf\n@@ -55,27 +55,46 @@ module \"routes\" {\n \tFirewall rules\n *****************************************/\n locals {\n- rules = [\n+ ingress_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_ranges = lookup(f, \"source_ranges\", null)\n+ destination_ranges = lookup(f, \"destination_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- }\n+ } if f.direction == \"INGRESS\"\n+ ]\n+ egress_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, {\n+ null)\n+ source_ranges = lookup(f, \"source_ranges\", null)\n+ destination_ranges = lookup(f, \"destination_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+ } if f.direction == \"EGRESS\"\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-}\n+ source = \"./modules/firewall-rules\"\n+ project_id = var.project_id\n+ network_name = module.vpc.network_name\n+ ingress_rules = local.ingress_rules\n+ egress_rules = local.egress_rules\n+}\n\\ No newline at end of file\n---\noutputs.tf\n@@ -88,3 +88,11 @@ output \"route_names\" {\n value = [for route in module.routes.routes : route.name]\n description = \"The route names associated with this VPC\"\n }\n+\n+\n+output \"ingress_rules\" {\n+ value = local.ingress_rules\n+}\n+output \"egress_rules\" {\n+ value = local.egress_rules\n+}\n\\ No newline at end of file\n---\n\n\n---\n\nChoice C:\nREADME.md\n@@ -116,6 +116,8 @@ Then perform the following commands on the root folder:\n \n | Name | Description |\n |------|-------------|\n+| egress\\_rules | n/a |\n+| ingress\\_rules | n/a |\n | network | The created network |\n | network\\_id | The ID of the VPC being created |\n | network\\_name | The name of the VPC being created |\n---\nmain.tf\n@@ -55,27 +55,46 @@ module \"routes\" {\n \tFirewall rules\n *****************************************/\n locals {\n- rules = [\n+ ingress_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_ranges = lookup(f, \"source_ranges\", null)\n+ destination_ranges = lookup(f, \"destination_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- }\n+ } if f.direction == \"INGRESS\"\n+ ]\n+ egress_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+ source_ranges = lookup(f, \"source_ranges\", null)\n+ destination_ranges = lookup(f, \"destination_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+ } if f.direction == \"EGRESS\"\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-}\n+ source = \"./modules/firewall-rules\"\n+ project_id = var.project_id\n+ network_name = module.vpc.network_name\n+ ingress_rules = local.ingress_rules\n+ egress_rules = local.egress_rules\n+}\n\\ No newline at end of file\n---\noutputs.tf\n@@ -88,3 +88,11 @@ output \"route_names\" {\n value = [for route in module.routes.routes : route.name]\n description = \"The route names associated with this VPC\"\n }\n+\n+\n+output \"ingress_rules\" {\n+ value = local.ingress_rules\n+}\n+output \"egress_rules\" {\n+ value = local.egress_rules\n+}\n\\ No newline at end of file\n---\n\n\n---\n\nChoice D:\nREADME.md\n@@ -116,6 +116,8 @@ Then perform the following commands on the root folder:\n \n | Name | Description |\n |------|-------------|\n+| egress\\_rules | n/a |\n+| ingress\\_rules | n/a |\n | network | The created network |\n | network\\_id | The ID of the VPC being created |\n | network\\_name | The name of the VPC being created |\n---\nmain.tf\n@@ -55,27 +55,46 @@ module \"routes\" {\n \tFirewall rules\n *****************************************/\n locals {\n- rules = [\n+ ingress_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_ranges = lookup(f, \"source_ranges\", null)\n+ destination_ranges = lookup(f, \"destination_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- }\n+ } if f.direction == \"INGRESS\"\n+ ]\n+ egress_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+ source_ranges = lookup(f, \"source_ranges\", null)\n+ destination_ranges = lookup(f, \"destination_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+ } if f.direction == \"EGRESS\"\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-}\n+ source = \"./modules/firewall-rules\"\n+ project_id = var.project_id\n+ network_name = module.vpc.network_name\n+ ingress_rules = local.ingress_rules\n+ egress_rules = local.egress_rules\n+}\n\\ No newline at end of file\n---\noutputs.tf\n@@ -88,3 +88,11 @@ output \"route_names\" {\n value = [for route in module.routes.routes : route.name]\n description = \"The route names associated with this VPC\"\n }\n+\n+\n+output \"ingress_rules\" {\n+ value = local.ingress_rules\n+}\n+output \"egress_rules\" {\n+ value = local.egress_rules\n+}\n\\ No newline at end of file\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:\nAdd `stack_type` variable to the `network-peering` module.\r\n\r\nThe `stack_type` value will be added to `local` and `peer` resources.\r\n\r\n[Link](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering#stack_type) to the `stack_type` field in google provider.\n\n---\n\nChoice A:\nmodules/network-peering/README.md\n@@ -56,6 +56,7 @@ module \"peering-a-c\" {\n | module\\_depends\\_on | List of modules or resources this module depends on. | `list(any)` yes `[]` | 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+| stack\\_type | Which IP version(s) of traffic and routes are allowed to be imported or exported between peer networks. Possible values: [\"IPV4\\_ONLY\", \"IPV4\\_IPV6\"]. | `string` | `\"IPV4_ONLY\"` | no |\n \n ## Outputs\n \n---\nmodules/network-peering/main.tf\n@@ -42,6 +42,8 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\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+ stack_type = var.stack_type\n+\n depends_on = [null_resource.module_depends_on]\n }\n \n@@ -56,6 +58,8 @@ resource \"google_compute_network_peering\" \"peer_network_peering\" {\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+ stack_type = var.stack_type\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@@ -59,3 +59,9 @@ variable \"module_depends_on\" {\n type = list(any)\n default = []\n }\n+\n+variable \"stack_type\" {\n+ description = \"Which IP version(s) of traffic and routes are allowed to be imported or exported between peer networks. Possible values: [\\\"IPV4_ONLY\\\", \\\"IPV4_IPV6\\\"].\"\n+ type = string\n+ default = \"IPV4_ONLY\"\n+}\n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"<5.0,>= 2.12\"\n+ version = \">= 4.65, <5.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \"<5.0,>= 2.12\"\n+ version = \">= 4.65, <5.0\"\n }\n random = {\n source = \"hashicorp/random\"\n---\n\n\n---\n\nChoice B:\nmodules/network-peering/README.md\n@@ -56,6 +56,7 @@ module \"peering-a-c\" {\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+| stack\\_type | Which IP version(s) of traffic and routes are allowed to be imported or exported between peer networks. Possible values: [\"IPV4\\_ONLY\", \"IPV4\\_IPV6\"]. | `string` | `\"IPV4_ONLY\"` | no |\n \n ## Outputs\n \n---\nmodules/network-peering/main.tf\n@@ -42,6 +42,8 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\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+ stack_type = var.stack_type\n+\n depends_on = [null_resource.module_depends_on]\n }\n \n@@ -56,6 +58,8 @@ resource \"google_compute_network_peering\" \"peer_network_peering\" {\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+ stack_type = var.stack_type\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@@ -59,3 +59,9 @@ variable \"module_depends_on\" {\n type = list(any)\n default = []\n }\n+\n+variable \"stack_type\" {\n+ description = \"Which IP version(s) of traffic and routes are allowed to be imported or exported between peer networks. Possible values: [\\\"IPV4_ONLY\\\", \\\"IPV4_IPV6\\\"].\"\n+ type = string\n+ default = \"IPV4_ONLY\"\n+}\n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"<5.0,>= 2.12\"\n+ version = \">= 4.65, <5.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \"<5.0,>= 2.12\"\n+ version = \">= 4.65, <5.0\"\n }\n or = {\n source = \"hashicorp/random\"\n---\n\n\n---\n\nChoice C:\nmodules/network-peering/README.md\n@@ -56,6 +56,7 @@ module \"peering-a-c\" {\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+| stack\\_type | Which IP version(s) of traffic and routes are allowed to be imported or exported between peer networks. Possible values: [\"IPV4\\_ONLY\", \"IPV4\\_IPV6\"]. | `string` | `\"IPV4_ONLY\"` | no |\n \n ## Outputs\n \n---\nmodules/network-peering/main.tf\n@@ -42,6 +42,8 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\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+ stack_type = var.stack_type\n+\n depends_on = [null_resource.module_depends_on]\n }\n \n@@ -56,6 +58,8 @@ resource \"google_compute_network_peering\" \"peer_network_peering\" {\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+ stack_type = var.stack_type\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@@ -59,3 +59,9 @@ variable \"module_depends_on\" {\n type = list(any)\n default = []\n }\n+\n+variable \"stack_type\" {\n+ description = \"Which IP version(s) of traffic and routes are allowed to be imported or exported between peer networks. Possible values: [\\\"IPV4_ONLY\\\", \\\"IPV4_IPV6\\\"].\"\n+ type = string\n+ default = \"IPV4_ONLY\"\n+}\n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"<5.0,>= 2.12\"\n+ version = \">= 4.65, <5.0\"\n }\n = {\n source = \"hashicorp/google-beta\"\n- version = \"<5.0,>= 2.12\"\n+ version = \">= 4.65, <5.0\"\n }\n random = {\n source = \"hashicorp/random\"\n---\n\n\n---\n\nChoice D:\nmodules/network-peering/README.md\n@@ -56,6 +56,7 @@ module \"peering-a-c\" {\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+| stack\\_type | Which IP version(s) of traffic and routes are allowed to be imported or exported between peer networks. Possible values: [\"IPV4\\_ONLY\", \"IPV4\\_IPV6\"]. | `string` | `\"IPV4_ONLY\"` | no |\n \n ## Outputs\n \n---\nmodules/network-peering/main.tf\n@@ -42,6 +42,8 @@ resource \"google_compute_network_peering\" \"local_network_peering\" {\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+ stack_type = var.stack_type\n+\n depends_on = [null_resource.module_depends_on]\n }\n \n@@ -56,6 +58,8 @@ resource \"google_compute_network_peering\" \"peer_network_peering\" {\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+ stack_type = var.stack_type\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@@ -59,3 +59,9 @@ variable \"module_depends_on\" {\n type = list(any)\n default = []\n }\n+\n+variable \"stack_type\" {\n+ description = \"Which IP version(s) of traffic and routes are allowed to be imported or exported between peer networks. Possible values: [\\\"IPV4_ONLY\\\", \\\"IPV4_IPV6\\\"].\"\n+ type = string\n+ default = \"IPV4_ONLY\"\n+}\n---\nmodules/network-peering/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"<5.0,>= 2.12\"\n+ version = \">= 4.65, <5.0\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \"<5.0,>= 2.12\"\n+ version = \">= 4.65, <5.0\"\n }\n random = {\n source = \"hashicorp/random\"\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:\nexamples/simple_ipv6_project/main.tf\n@@ -29,11 +29,11 @@ module \"test-vpc-module\" {\n \n subnets = [\n {\n- subnet_name {\n = \"subnet-01\"\n- subnet_ip = \"10.10.10.0/24\"\n- subnet_region = \"us-west1\"\n- stack = \"IPV4_IPV6\"\n- ipv6_type = \"EXTERNAL\"\n+ subnet_name = \"subnet-01\"\n+ subnet_ip = \"10.10.10.0/24\"\n+ subnet_region = \"us-west1\"\n+ stack_type = \"IPV4_IPV6\"\n+ ipv6_access_type = \"EXTERNAL\"\n },\n {\n subnet_name = \"subnet-02\"\n---\n\n\n---\n\nChoice B:\nexamples/simple_ipv6_project/main.tf\n@@ -29,11 +29,11 @@ module \"test-vpc-module\" {\n \n subnets = [\n {\n- subnet_name = \"subnet-01\"\n- subnet_ip = \"10.10.10.0/24\"\n- subnet_region \"us-west1\"\n+ \"us-west1\"\n- stack = \"IPV4_IPV6\"\n- ipv6_type = \"EXTERNAL\"\n+ subnet_name = \"subnet-01\"\n+ subnet_ip = \"10.10.10.0/24\"\n+ subnet_region = \"us-west1\"\n+ stack_type = \"IPV4_IPV6\"\n+ ipv6_access_type = \"EXTERNAL\"\n },\n {\n subnet_name = \"subnet-02\"\n---\n\n\n---\n\nChoice C:\nexamples/simple_ipv6_project/main.tf\n@@ -29,11 +29,11 @@ module \"test-vpc-module\" {\n \n subnets = [\n {\n- subnet_name = \"subnet-01\"\n- subnet_ip = \"10.10.10.0/24\"\n- subnet_region = \"us-west1\"\n- stack = \"IPV4_IPV6\"\n- ipv6_access_type ipv6_type = \"EXTERNAL\"\n+ subnet_name = \"subnet-01\"\n+ subnet_ip = \"10.10.10.0/24\"\n+ subnet_region = \"us-west1\"\n+ stack_type = \"IPV4_IPV6\"\n+ ipv6_access_type = \"EXTERNAL\"\n },\n {\n subnet_name = \"subnet-02\"\n---\n\n\n---\n\nChoice D:\nexamples/simple_ipv6_project/main.tf\n@@ -29,11 +29,11 @@ module \"test-vpc-module\" {\n \n subnets = [\n {\n- subnet_name = \"subnet-01\"\n- subnet_ip = \"10.10.10.0/24\"\n- subnet_region = \"us-west1\"\n- stack = \"IPV4_IPV6\"\n- ipv6_type = \"EXTERNAL\"\n+ subnet_name = \"subnet-01\"\n+ subnet_ip = \"10.10.10.0/24\"\n+ subnet_region = \"us-west1\"\n+ stack_type = \"IPV4_IPV6\"\n+ ipv6_access_type = \"EXTERNAL\"\n },\n {\n subnet_name = \"subnet-02\"\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 | minor | `v0.43.13` -> `v0.44.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.44.0`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.44.0)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.43.13...v0.44.0)\n\n#### Description\n\n- Updated minimal Go version to 1.21\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/1339](https://togithub.com/gruntwork-io/terratest/pull/1339)\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi45Ny4xIiwidXBkYXRlZEluVmVyIjoiMzYuOTcuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,7 +4,7 @@ go 1.20\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1\n-\tgithub.com/gruntwork-io/terratest v0.43.13\n+\tgithub.com/gruntwork-io/terratest v0.44.0\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.16.0\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ h1:3k7lglJFAtw77p2HnR5vaZBCBnlHmu3DuLjVyuCZXJ0=\n+github.com/gruntwork-io/terratest v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.43.13 h1:/d0UeDj/FJM66VRP/3JA4mTw0z7BOm9ntHYfrTjIpY8=\n-github.com/gruntwork-io/terratest v0.43.13/go.mod h1:Tw+6/fcJFiBPpsx9NNSkLG5oHKIeaqiJHVLpQ+ORIfQ=\n+github.com/gruntwork-io/terratest v0.44.0 h1:3k7lglJFAtw77p2HnR5vaZBCBnlHmu3DuLjVyuCZXJ0=\n+github.com/gruntwork-io/terratest v0.44.0/go.mod h1:EAEuzSjvxAzQoJCEQ06bJPTmdC9HikzgvhmxnAYuExM=\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.20\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1\n-\tgithub.com/gruntwork-io/terratest v0.43.13\n+\tgithub.com/gruntwork-io/terratest v0.44.0\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.16.0\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.43.13 @@ v0.43.13/go.mod h1:Tw+6/fcJFiBPpsx9NNSkLG5oHKIeaqiJHVLpQ+ORIfQ=\n+github.com/gruntwork-io/terratest v0.44.0 h1:3k7lglJFAtw77p2HnR5vaZBCBnlHmu3DuLjVyuCZXJ0=\n+github.com/gruntwork-io/terratest v0.44.0/go.mod h1:EAEuzSjvxAzQoJCEQ06bJPTmdC9HikzgvhmxnAYuExM=\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.20\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1\n-\tgithub.com/gruntwork-io/terratest v0.43.13\n+\tgithub.com/gruntwork-io/terratest v0.44.0\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.16.0\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n require v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.43.13 h1:/d0UeDj/FJM66VRP/3JA4mTw0z7BOm9ntHYfrTjIpY8=\n-github.com/gruntwork-io/terratest v0.43.13/go.mod h1:Tw+6/fcJFiBPpsx9NNSkLG5oHKIeaqiJHVLpQ+ORIfQ=\n+github.com/gruntwork-io/terratest v0.44.0 h1:3k7lglJFAtw77p2HnR5vaZBCBnlHmu3DuLjVyuCZXJ0=\n+github.com/gruntwork-io/terratest v0.44.0/go.mod h1:EAEuzSjvxAzQoJCEQ06bJPTmdC9HikzgvhmxnAYuExM=\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.20\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.1\n-\tgithub.com/gruntwork-io/terratest v0.43.13\n+\tgithub.com/gruntwork-io/terratest v0.44.0\n \tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.16.0\n )\n---\ntest/integration/go.sum\n@@ -349,8 +349,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56\n github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=\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.43.13 h1:/d0UeDj/FJM66VRP/3JA4mTw0z7BOm9ntHYfrTjIpY8=\n-github.com/gruntwork-io/terratest v0.43.13/go.mod h1:Tw+6/fcJFiBPpsx9NNSkLG5oHKIeaqiJHVLpQ+ORIfQ=\n+github.com/gruntwork-io/terratest v0.44.0 h1:3k7lglJFAtw77p2HnR5vaZBCBnlHmu3DuLjVyuCZXJ0=\n+github.com/gruntwork-io/terratest v0.44.0/go.mod h1:EAEuzSjvxAzQoJCEQ06bJPTmdC9HikzgvhmxnAYuExM=\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)\r\n\r\nThis PR contains the following updates:\r\n\r\n| Package | Type | Update | Change |\r\n|---|---|---|---|\r\n| [actions/checkout](https://togithub.com/actions/checkout) | action | major | `v3` -> `v4` |\r\n\r\n---\r\n\r\n### Release Notes\r\n\r\n<details>\r\n<summary>actions/checkout (actions/checkout)</summary>\r\n\r\n### [`v4`](https://togithub.com/actions/checkout/blob/HEAD/CHANGELOG.md#v400)\r\n\r\n[Compare Source](https://togithub.com/actions/checkout/compare/v3...v4)\r\n\r\n- [Support fetching without the --progress option](https://togithub.com/actions/checkout/pull/1067)\r\n- [Update to node20](https://togithub.com/actions/checkout/pull/1436)\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 is behind base branch, 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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\r\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi44My4wIiwidXBkYXRlZEluVmVyIjoiMzYuODMuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\r\n\r\nBEGIN_COMMIT_OVERRIDE\r\nchore(deps): update actions/checkout action to v4 (#494)\r\nEND_COMMIT_OVERRIDE\n\n---\n\nChoice A:\n.github/workflows/lint.yaml\n@@ -31,7 +31,7 @@ jobs:\n name: 'lint'\n runs-on: 'ubuntu-latest'\n steps:\n- - uses: 'actions/checkout@v3'\n+ - uses: 'actions/checkout@v4'\n - id: variables\n run: |\n MAKEFILE=$(find . -name Makefile -print -quit)\n---\n\n\n---\n\nChoice B:\n.github/workflows/lint.yaml\n@@ -31,7 +31,7 @@ jobs:\n name: 'lint'\n runs-on: 'ubuntu-latest'\n steps:\n- - uses: 'actions/checkout@v3'\n+ - uses: 'actions/checkout@v4'\n -quit)\n---\n - id: variables\n run: |\n MAKEFILE=$(find . -name Makefile -print -quit)\n---\n\n\n---\n\nChoice C:\n.github/workflows/lint.yaml\n@@ -31,7 +31,7 @@ jobs:\n name: 'lint'\n runs-on: 'ubuntu-latest'\n steps:\n- - uses: 'actions/checkout@v3'\n+ - uses: 'actions/checkout@v4'\n -name - id: variables\n run: |\n MAKEFILE=$(find . -name Makefile -print -quit)\n---\n\n\n---\n\nChoice D:\n.github/workflows/lint.yaml\n@@ -31,7 +31,7 @@ jobs:\n name: 'lint'\n runs-on: 'ubuntu-latest'\n steps:\n- - uses: 'actions/checkout@v3'\n+ - uses: 'actions/checkout@v4'\n - id: variables\n run: |\n MAKEFILE=$(find . -name Makefile -print -quit)\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| [actions/checkout](https://togithub.com/actions/checkout) | action | major | `v3` -> `v4` |\r\n\r\n---\r\n\r\n### Release Notes\r\n\r\n<details>\r\n<summary>actions/checkout (actions/checkout)</summary>\r\n\r\n### [`v4`](https://togithub.com/actions/checkout/blob/HEAD/CHANGELOG.md#v400)\r\n\r\n[Compare Source](https://togithub.com/actions/checkout/compare/v3...v4)\r\n\r\n- [Support fetching without the --progress option](https://togithub.com/actions/checkout/pull/1067)\r\n- [Update to node20](https://togithub.com/actions/checkout/pull/1436)\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 is behind base branch, 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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\r\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi44My4wIiwidXBkYXRlZEluVmVyIjoiMzYuODMuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\r\n\r\nBEGIN_COMMIT_OVERRIDE\r\nchore(deps): update actions/checkout action to v4 (#493)\r\nEND_COMMIT_OVERRIDE\r\n\n\n---\n\nChoice A:\n.github/workflows/lint.yaml\n@@ -31,7 +31,7 @@ jobs:\n name: 'lint'\n runs-on: 'ubuntu-latest'\n steps:\n- - uses: 'actions/checkout@v3'\n+ - uses: 'actions/checkout@v4'\n - id: variables\n run: |\n MAKEFILE=$(find . -name Makefile -print -quit)\n---\n\n\n---\n\nChoice B:\n.github/workflows/lint.yaml\n@@ -31,7 +31,7 @@ jobs:\n name: runs-on: 'ubuntu-latest'\n steps:\n- - uses: 'actions/checkout@v3'\n+ - uses: 'actions/checkout@v4'\n - id: variables\n run: |\n MAKEFILE=$(find . -name Makefile -print -quit)\n---\n\n\n---\n\nChoice C:\n.github/workflows/lint.yaml\n@@ -31,7 +31,7 @@ jobs:\n name: 'lint'\n runs-on: 'ubuntu-latest'\n steps:\n- - uses: 'actions/checkout@v3'\n+ - uses: 'actions/checkout@v4'\n - id: variables\n run: |\n MAKEFILE=$(find . -name Makefile -print -quit)\n---\n\n\n---\n\nChoice D:\n.github/workflows/lint.yaml\n@@ -31,7 +31,7 @@ jobs:\n name: 'lint'\n runs-on: 'ubuntu-latest'\n steps:\n- - uses: 'actions/checkout@v3'\n+ 'lint'\n uses: 'actions/checkout@v4'\n - id: variables\n run: |\n MAKEFILE=$(find . -name Makefile -print -quit)\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:\n1. ipv6 support was added to the inner VPC module but the capability to pass values from the root module was missing.\r\n2. Updated README to reflect new options.\n\n---\n\nChoice A:\nREADME.md\n@@ -103,8 +103,10 @@ 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 | egress\\_rules | List of egress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n+| enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n | firewall\\_rules | This is DEPRICATED and available for backward compatiblity. Use ingress\\_rules and egress\\_rules variables. List of firewall rules | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> direction = optional(string, \"INGRESS\")<br> priority = optional(number, null)<br> ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n | ingress\\_rules | List of ingress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n+| internal\\_ipv6\\_range | When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null) | `string` | `null` | 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\\_firewall\\_policy\\_enforcement\\_order | Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`) | `string` | `null` | no |\n | network\\_name | The name of the network being created | `string` | n/a | yes |\n---\nmain.tf\n@@ -27,6 +27,8 @@ module \"vpc\" {\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+ enable_ipv6_ula = var.enable_ipv6_ula\n+ internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n }\n \n---\nvariables.tf\n@@ -179,6 +179,18 @@ variable \"egress_rules\" {\n }))\n }\n \n+variable \"enable_ipv6_ula\" {\n+ type = bool\n+ description = \"Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false')\"\n+ default = false\n+}\n+\n+variable \"internal_ipv6_range\" {\n+ type = string\n+ default = null\n+ description = \"When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null)\"\n+}\n+\n variable \"network_firewall_policy_enforcement_order\" {\n type = string\n default = null\n---\n\n\n---\n\nChoice B:\nREADME.md\n@@ -103,8 +103,10 @@ 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 | egress\\_rules | List of egress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n+| enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n | firewall\\_rules | This is DEPRICATED and available for backward compatiblity. Use ingress\\_rules and egress\\_rules variables. List of firewall rules | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> direction = optional(string, \"INGRESS\")<br> priority = optional(number, null)<br> ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n | ingress\\_rules | List of ingress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n+| internal\\_ipv6\\_range | When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null) | `string` | `null` | 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\\_firewall\\_policy\\_enforcement\\_order | Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`) | `string` | `null` | no |\n | network\\_name | The name of the network being created | `string` | n/a | yes |\n---\nmain.tf\n@@ -27,6 +27,8 @@ module \"vpc\" {\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+ enable_ipv6_ula = var.enable_ipv6_ula\n+ internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n }\n \n---\nvariables.tf\n@@ -179,6 +179,18 @@ variable \"egress_rules\" {\n }))\n }\n \n+variable \"enable_ipv6_ula\" {\n+ type = bool\n+ description = \"Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false')\"\n+ default = false\n+}\n+\n+variable \"internal_ipv6_range\" {\n+ type = string\n+ default = null\n+ description = \"When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null)\"\n+}\n+\n variable \"network_firewall_policy_enforcement_order\" {\n type = string\n default = null\n---\n\n\n---\n\nChoice C:\nREADME.md\n@@ -103,8 +103,10 @@ 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 | egress\\_rules | List of egress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n+| enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n | firewall\\_rules | This is DEPRICATED and available for backward compatiblity. Use ingress\\_rules and egress\\_rules variables. List of firewall rules | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> direction = optional(string, \"INGRESS\")<br> priority = optional(number, null)<br> ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n | ingress\\_rules | List of ingress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n+| internal\\_ipv6\\_range | When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null) | `string` | `null` | 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\\_firewall\\_policy\\_enforcement\\_order | Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`) | `string` | `null` | no |\n | network\\_name | The name of the network being created | `string` | n/a | yes |\n---\nmain.tf\n@@ -27,6 +27,8 @@ module \"vpc\" {\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+ enable_ipv6_ula = var.enable_ipv6_ula\n+ internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n }\n \n---\nvariables.tf\n@@ -179,6 +179,18 @@ variable \"egress_rules\" {\n }))\n }\n \n+variable \"enable_ipv6_ula\" {\n+ type = bool\n+ description = \"Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false')\"\n+ default = false\n+}\n+\n+variable \"internal_ipv6_range\" {\n+ type = string\n+ default = null\n+ description = \"When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null)\"\n+}\n+\n variable \"network_firewall_policy_enforcement_order\" {\n type = string\n default = null\n---\n\n\n---\n\nChoice D:\nREADME.md\n@@ -103,8 +103,10 @@ 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 | egress\\_rules | List of egress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n+| enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n | firewall\\_rules | This is DEPRICATED and available for backward compatiblity. Use ingress\\_rules and egress\\_rules variables. List of firewall rules | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> direction = optional(string, \"INGRESS\")<br> priority = optional(number, null)<br> ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n | ingress\\_rules | List of ingress rules. This will be ignored if variable 'rules' is non-empty | <pre>list(object({<br> name = string<br> description = optional(string, null)<br> priority = optional(number, null)<br> destination_ranges = optional(list(string), [])<br> source_ranges = optional(list(string), [])<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br><br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })), [])<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n+| internal\\_ipv6\\_range | When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null) | `string` | `null` | 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\\_firewall\\_policy\\_enforcement\\_order | Set the order that Firewall Rules and Firewall Policies are evaluated. Valid values are `BEFORE_CLASSIC_FIREWALL` and `AFTER_CLASSIC_FIREWALL`. (default null or equivalent to `AFTER_CLASSIC_FIREWALL`) | `string` | `null` | no |\n | network\\_name | The name of the network being created | `string` | n/a | yes |\n---\nmain.tf\n@@ -27,6 +27,8 @@ module \"vpc\" {\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+ enable_ipv6_ula = var.enable_ipv6_ula\n+ internal_ipv6_range = var.internal_ipv6_range\n network_firewall_policy_enforcement_order = var.network_firewall_policy_enforcement_order\n }\n \n---\nvariables.tf\n@@ -179,6 +179,18 @@ variable \"egress_rules\" {\n }))\n }\n \n+variable \"enable_ipv6_ula\" {\n+ type = bool\n+ description = \"Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false')\"\n+ default = false\n+}\n+\n+variable \"internal_ipv6_range\" {\n+ type = string\n+ default = null\n+ description = \"When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null)\"\n+}\n+\n variable \"network_firewall_policy_enforcement_order\" {\n type = string\n default = null\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| [terraform-google-modules/cloud-dns/google](https://registry.terraform.io/modules/terraform-google-modules/cloud-dns/google) ([source](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns)) | module | major | `~> 4.1` -> `~> 5.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-cloud-dns (terraform-google-modules/cloud-dns/google)</summary>\n\n### [`v5.0.1`](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/blob/HEAD/CHANGELOG.md#501-2023-07-19)\n\n[Compare Source](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/compare/v5.0.0...v5.0.1)\n\n##### Bug Fixes\n\n- add support for empty networks ([#​53](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/issues/53)) ([54f6504](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/commit/54f6504b9c034afc8a34fccb3db9de26a1dd702b))\n\n### [`v5.0.0`](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/blob/HEAD/CHANGELOG.md#500-2023-04-06)\n\n[Compare Source](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/compare/v4.2.1...v5.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- Increased minimum Google Provider version to 4.40 ([#​47](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/issues/47))\n\n- add cloud logging option for public DNS ([#​47](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/issues/47))\n\n##### Features\n\n- add cloud logging option for public DNS ([#​47](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/issues/47)) ([c441d5c](https://togithub.com/terraform-google-modules/terraform-google-cloud-dns/commit/c441d5c2d623cf590407c870613db77f4e19a6b5))\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS42Ni4xIiwidXBkYXRlZEluVmVyIjoiMzYuMjcuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\n\n\n---\n\nChoice A:\nmodules/private-service-connect/dns.tf\n@@ -20,7 +20,7 @@\n \n module \"googleapis\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}apis\"\n@@ -53,7 +53,7 @@ module \"googleapis\" {\n \n module \"gcr\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n var.project_id\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}gcr\"\n@@ -86,7 +86,7 @@ module \"gcr\" {\n \n module \"pkg_dev\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}pkg-dev\"\n---\n\n\n---\n\nChoice B:\nmodules/private-service-connect/dns.tf\n@@ -20,7 +20,7 @@\n \n module \"googleapis\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}apis\"\n@@ -53,7 +53,7 @@ module \"googleapis\" {\n \n module \"gcr\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}gcr\"\n@@ -86,7 +86,7 @@ module \"gcr\" {\n \n module \"pkg_dev\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = name = \"${local.dns_code}pkg-dev\"\n---\n\n\n---\n\nChoice C:\nmodules/private-service-connect/dns.tf\n@@ -20,7 +20,7 @@\n \n module \"googleapis\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}apis\"\n@@ -53,7 +53,7 @@ module \"googleapis\" {\n \n module \"gcr\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}gcr\"\n@@ -86,7 +86,7 @@ module \"gcr\" {\n \n module \"pkg_dev\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}pkg-dev\"\n---\n\n\n---\n\nChoice D:\nmodules/private-service-connect/dns.tf\n@@ -20,7 +20,7 @@\n \n module \"googleapis\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}apis\"\n@@ -53,7 +53,7 @@ module \"googleapis\" {\n \n module \"gcr\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}gcr\"\n@@ -86,7 +86,7 @@ module \"gcr\" {\n \n module \"pkg_dev\" {\n source = \"terraform-google-modules/cloud-dns/google\"\n- version = \"~> 4.1\"\n+ version = \"~> 5.0\"\n project_id = var.project_id\n type = \"private\"\n name = \"${local.dns_code}pkg-dev\"\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 | Update | Change |\n|---|---|---|\n| cft/developer-tools | minor | `1.13` -> `1.14` |\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://developer.mend.io/github/terraform-google-modules/terraform-google-network).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4yNC4yIiwidXBkYXRlZEluVmVyIjoiMzYuMjQuMiIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.13\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.14\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ := - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'\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.13'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'\n---\n\n\n---\n\nChoice B:\nMakefile\n@@ -15,7 +15,7 @@\n # will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.13\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.14\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'\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.13'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'\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.13\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.14\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- := _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'\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.13'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'\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.13\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.14\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -216,4 +216,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'\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.13'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'\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## [7.3.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.2.0...v7.3.0) (2023-08-09)\n\n\n### Features\n\n* add ingress and egress firewall rules to main module ([#485](https://github.com/terraform-google-modules/terraform-google-network/issues/485)) ([663f1d8](https://github.com/terraform-google-modules/terraform-google-network/commit/663f1d892ce4dd74b46b7a69767eb29731882e0d))\n\n\n### Bug Fixes\n\n* added missing variables ([#481](https://github.com/terraform-google-modules/terraform-google-network/issues/481)) ([71a1177](https://github.com/terraform-google-modules/terraform-google-network/commit/71a11777cb5c432459ae0cdca2bc625c5c513651))\n* network attachment error in firewall policy sub-module ([#478](https://github.com/terraform-google-modules/terraform-google-network/issues/478)) ([2dde9d8](https://github.com/terraform-google-modules/terraform-google-network/commit/2dde9d83cba253148a37621cfbe69d2a1f2b9a14))\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+## [7.3.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.2.0...v7.3.0) (2023-08-09)\n+\n+\n+### Features\n+\n+* add ingress and egress firewall rules to main module ([#485](https://github.com/terraform-google-modules/terraform-google-network/issues/485)) ([663f1d8](https://github.com/terraform-google-modules/terraform-google-network/commit/663f1d892ce4dd74b46b7a69767eb29731882e0d))\n+\n+\n+### Bug Fixes\n+\n+* added missing variables ([#481](https://github.com/terraform-google-modules/terraform-google-network/issues/481)) ([71a1177](https://github.com/terraform-google-modules/terraform-google-network/commit/71a11777cb5c432459ae0cdca2bc625c5c513651))\n+* network attachment error in firewall policy sub-module ([#478](https://github.com/terraform-google-modules/terraform-google-network/issues/478)) ([2dde9d8](https://github.com/terraform-google-modules/terraform-google-network/commit/2dde9d83cba253148a37621cfbe69d2a1f2b9a14))\n+\n ## [7.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.1.0...v7.2.0) (2023-07-25)\n \n \n---\nREADME.md\n@@ -25,7 +25,7 @@ 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 = \"~> 7.2\"\n+ version = \"~> 7.3\"\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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.3.0\"\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.3.0\"\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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.3.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.3.0\"\n }\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+## [7.3.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.2.0...v7.3.0) (2023-08-09)\n+\n+\n+### Features\n+\n+* add ingress and egress firewall rules to main module ([#485](https://github.com/terraform-google-modules/terraform-google-network/issues/485)) ([663f1d8](https://github.com/terraform-google-modules/terraform-google-network/commit/663f1d892ce4dd74b46b7a69767eb29731882e0d))\n+\n+\n+### Bug Fixes\n+\n+* added missing variables ([#481](https://github.com/terraform-google-modules/terraform-google-network/issues/481)) ([71a1177](https://github.com/terraform-google-modules/terraform-google-network/commit/71a11777cb5c432459ae0cdca2bc625c5c513651))\n+* network attachment error in firewall policy sub-module ([#478](https://github.com/terraform-google-modules/terraform-google-network/issues/478)) ([2dde9d8](https://github.com/terraform-google-modules/terraform-google-network/commit/2dde9d83cba253148a37621cfbe69d2a1f2b9a14))\n+\n ## [7.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.1.0...v7.2.0) (2023-07-25)\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 = \"~> 7.2\"\n+ version = \"~> 7.3\"\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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.3.0\"\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.3.0\"\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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.3.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.3.0\"\n }\n }\n---\nmodules/routes-beta/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google-beta\" module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.3.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+## [7.3.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.2.0...v7.3.0) (2023-08-09)\n+\n+\n+### Features\n+\n+* add ingress and egress firewall rules to main module ([#485](https://github.com/terraform-google-modules/terraform-google-network/issues/485)) ([663f1d8](https://github.com/terraform-google-modules/terraform-google-network/commit/663f1d892ce4dd74b46b7a69767eb29731882e0d))\n+\n+\n+### Bug Fixes\n+\n+* added missing variables ([#481](https://github.com/terraform-google-modules/terraform-google-network/issues/481)) ([71a1177](https://github.com/terraform-google-modules/terraform-google-network/commit/71a11777cb5c432459ae0cdca2bc625c5c513651))\n+* network attachment error in firewall policy sub-module ([#478](https://github.com/terraform-google-modules/terraform-google-network/issues/478)) ([2dde9d8](https://github.com/terraform-google-modules/terraform-google-network/commit/2dde9d83cba253148a37621cfbe69d2a1f2b9a14))\n+\n ## [7.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.1.0...v7.2.0) (2023-07-25)\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 = \"~> 7.2\"\n+ version = \"~> 7.3\"\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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.3.0\"\n \"blueprints/terraform/terraform-google-network:vpc/v7.2.0\"\n+ }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.3.0\"\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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.3.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.3.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+## [7.3.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.2.0...v7.3.0) (2023-08-09)\n+\n+\n+### Features\n+\n+* add ingress and egress firewall rules to main module ([#485](https://github.com/terraform-google-modules/terraform-google-network/issues/485)) ([663f1d8](https://github.com/terraform-google-modules/terraform-google-network/commit/663f1d892ce4dd74b46b7a69767eb29731882e0d))\n+\n+\n+### Bug Fixes\n+\n+* added missing variables ([#481](https://github.com/terraform-google-modules/terraform-google-network/issues/481)) ([71a1177](https://github.com/terraform-google-modules/terraform-google-network/commit/71a11777cb5c432459ae0cdca2bc625c5c513651))\n+* network attachment error in firewall policy sub-module ([#478](https://github.com/terraform-google-modules/terraform-google-network/issues/478)) ([2dde9d8](https://github.com/terraform-google-modules/terraform-google-network/commit/2dde9d83cba253148a37621cfbe69d2a1f2b9a14))\n+\n ## [7.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.1.0...v7.2.0) (2023-07-25)\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 = \"~> 7.2\"\n+ version = \"~> 7.3\"\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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.3.0\"\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.3.0\"\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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.3.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.3.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.3.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/v7.2.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.3.0\"\n }\n }\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP VPC/network change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nFixes missing outputs when using ingress/egress rules\n\n---\n\nChoice A:\nmodules/firewall-rules/README.md\n@@ -51,6 +51,7 @@ module \"firewall_rules\" {\n | Name | Description |\n |------|-------------|\n | firewall\\_rules | The created firewall rule resources |\n+| firewall\\_rules\\_ingress\\_egress | The created firewall ingress/egress rule resources |\n \n <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n \n---\nmodules/firewall-rules/outputs.tf\n@@ -18,3 +18,8 @@ output \"firewall_rules\" value = google_compute_firewall.rules\n description = \"The created firewall rule resources\"\n }\n+\n+output \"firewall_rules_ingress_egress\" {\n+ value = google_compute_firewall.rules_ingress_egress\n+ description = \"The created firewall ingress/egress rule resources\"\n+}\n---\n\n\n---\n\nChoice B:\nmodules/firewall-rules/README.md\n@@ -51,6 +51,7 @@ module \"firewall_rules\" {\n | Name | Description |\n |------|-------------|\n | firewall\\_rules | The created firewall rule resources |\n+| firewall\\_rules\\_ingress\\_egress | The created firewall ingress/egress rule resources |\n \n <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n \n---\nmodules/firewall-rules/outputs.tf\n@@ -18,3 +18,8 @@ output \"firewall_rules\" {\n value = google_compute_firewall.rules\n description = \"The created firewall rule resources\"\n }\n+\n+output \"firewall_rules_ingress_egress\" {\n+ value = google_compute_firewall.rules_ingress_egress\n+ description = \"The created firewall ingress/egress rule resources\"\n+}\n---\n\n\n---\n\nChoice C:\nmodules/firewall-rules/README.md\n@@ -51,6 +51,7 @@ module \"firewall_rules\" {\n | Name | Description |\n |------|-------------|\n | firewall\\_rules | The created firewall rule resources |\n+| firewall\\_rules\\_ingress\\_egress | The created firewall ingress/egress rule resources |\n \n <!-- END OF ingress/egress DOCS HOOK -->\n \n---\nmodules/firewall-rules/outputs.tf\n@@ -18,3 +18,8 @@ output \"firewall_rules\" {\n value = google_compute_firewall.rules\n description = \"The created firewall rule resources\"\n }\n+\n+output \"firewall_rules_ingress_egress\" {\n+ value = google_compute_firewall.rules_ingress_egress\n+ description = \"The created firewall ingress/egress rule resources\"\n+}\n---\n\n\n---\n\nChoice D:\n -51,6 +51,7 @@ module \"firewall_rules\" {\n | Name | Description |\n |------|-------------|\n | firewall\\_rules | The created firewall rule resources |\n+| firewall\\_rules\\_ingress\\_egress | The created firewall ingress/egress rule resources |\n \n <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->\n \n---\nmodules/firewall-rules/outputs.tf\n@@ -18,3 +18,8 @@ output \"firewall_rules\" {\n value = google_compute_firewall.rules\n description = \"The created firewall rule resources\"\n }\n+\n+output \"firewall_rules_ingress_egress\" {\n+ value = google_compute_firewall.rules_ingress_egress\n+ description = \"The created firewall ingress/egress rule resources\"\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## [7.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.1.0...v7.2.0) (2023-07-25)\n\n\n### Features\n\n* Add IPv6 ULA support and document subnet ipv6 support ([#466](https://github.com/terraform-google-modules/terraform-google-network/issues/466)) ([eb9d9fb](https://github.com/terraform-google-modules/terraform-google-network/commit/eb9d9fba67777ae3f0f20ac425789bc6489634c6))\n* add metadata_fields support ([#467](https://github.com/terraform-google-modules/terraform-google-network/issues/467)) ([f311cba](https://github.com/terraform-google-modules/terraform-google-network/commit/f311cba5b0689c84882ac7ae225b15e612371c6c))\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+## [7.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.1.0...v7.2.0) (2023-07-25)\n+\n+\n+### Features\n+\n+* Add IPv6 ULA support and document subnet ipv6 support ([#466](https://github.com/terraform-google-modules/terraform-google-network/issues/466)) ([eb9d9fb](https://github.com/terraform-google-modules/terraform-google-network/commit/eb9d9fba67777ae3f0f20ac425789bc6489634c6))\n+* add metadata_fields support ([#467](https://github.com/terraform-google-modules/terraform-google-network/issues/467)) ([f311cba](https://github.com/terraform-google-modules/terraform-google-network/commit/f311cba5b0689c84882ac7ae225b15e612371c6c))\n+\n ## [7.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.0.0...v7.1.0) (2023-06-27)\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 = \"~> 7.1\"\n+ version = \"~> 7.2\"\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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.2.0\"\n }\n }\n---\nmodules/firewall-rules/versions.tf\n@@ -25,6 +25,6 @@ terraform {\n }\n \n provider_meta \"google\" module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.2.0\"\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.2.0\"\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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.2.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.2.0\"\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+## [7.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.1.0...v7.2.0) (2023-07-25)\n+\n+\n+### Features\n+\n+* Add IPv6 ULA support and document subnet ipv6 support ([#466](https://github.com/terraform-google-modules/terraform-google-network/issues/466)) ([eb9d9fb](https://github.com/terraform-google-modules/terraform-google-network/commit/eb9d9fba67777ae3f0f20ac425789bc6489634c6))\n+* add metadata_fields support ([#467](https://github.com/terraform-google-modules/terraform-google-network/issues/467)) ([f311cba](https://github.com/terraform-google-modules/terraform-google-network/commit/f311cba5b0689c84882ac7ae225b15e612371c6c))\n+\n ## [7.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.0.0...v7.1.0) (2023-06-27)\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 = \"~> 7.1\"\n+ version = \"~> 7.2\"\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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.2.0\"\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- = module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.2.0\"\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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.2.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.2.0\"\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+## [7.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.1.0...v7.2.0) (2023-07-25)\n+\n+\n+### Features\n+\n+* Add IPv6 ULA support and document subnet ipv6 support ([#466](https://github.com/terraform-google-modules/terraform-google-network/issues/466)) ([eb9d9fb](https://github.com/terraform-google-modules/terraform-google-network/commit/eb9d9fba67777ae3f0f20ac425789bc6489634c6))\n+* add metadata_fields support ([#467](https://github.com/terraform-google-modules/terraform-google-network/issues/467)) ([f311cba](https://github.com/terraform-google-modules/terraform-google-network/commit/f311cba5b0689c84882ac7ae225b15e612371c6c))\n+\n ## [7.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.0.0...v7.1.0) (2023-06-27)\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 = \"~> 7.1\"\n+ version = \"~> 7.2\"\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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.2.0\"\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.2.0\"\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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.2.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.2.0\"\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+## [7.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.1.0...v7.2.0) (2023-07-25)\n+\n+\n+### Features\n+\n+* Add IPv6 ULA support and document subnet ipv6 support ([#466](https://github.com/terraform-google-modules/terraform-google-network/issues/466)) ([eb9d9fb](https://github.com/terraform-google-modules/terraform-google-network/commit/eb9d9fba67777ae3f0f20ac425789bc6489634c6))\n+* add metadata_fields support ([#467](https://github.com/terraform-google-modules/terraform-google-network/issues/467)) ([f311cba](https://github.com/terraform-google-modules/terraform-google-network/commit/f311cba5b0689c84882ac7ae225b15e612371c6c))\n+\n ## [7.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.0.0...v7.1.0) (2023-06-27)\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 = \"~> 7.1\"\n+ version = \"~> \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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.2.0\"\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.2.0\"\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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.2.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.2.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.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/v7.1.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.2.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* Add support for ULA on VPC network\r\n* Add optional ULA prefix for VPC network\r\n* Add documentation for subnet `stack` to enable dual-stack networking\r\n* Add documentation for IPv6 type to enable either `EXTERNAL` v6 addressing or `INTERNAL` when ULA is enabled in the VPC\n\n---\n\nChoice A:\nmodules/subnets-beta/README.md\n@@ -96,3 +96,6 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_metadata\\_fields | List of metadata fields that should be added to reported logs. Can only be specified if VPC flow logs for this subnetwork is enabled and \"metadata\" is set to CUSTOM_METADATA. | any | - | 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+| enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n+| internal\\_ipv6\\_range | When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null) | `string` | `null` | no |\n+\n---\nmodules/subnets-beta/main.tf\n@@ -62,8 +62,10 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n var.secondary_ranges[each.value.subnet_name][i]\n ]\n \n- purpose = lookup(each.value, \"purpose\", null)\n- role = lookup(each.value, \"role\", null)\n+ purpose = lookup(each.value, \"purpose\", null)\n+ role = lookup(each.value, \"role\", null)\n+ stack_type = lookup(each.value, \"stack\", null)\n+ ipv6_access_type = lookup(each.value, \"ipv6_type\", null)\n \n depends_on = [var.module_depends_on]\n }\n---\nmodules/subnets/README.md\n@@ -95,3 +95,5 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_metadata\\_fields | List of metadata fields that should be added to reported logs. Can only be specified if VPC flow logs for this subnetwork is enabled and \"metadata\" is set to CUSTOM_METADATA. | any | - | 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+| stack | `IPV4_ONLY` or `IPV4_IPV6` for dual-stack networking | string | - | no |\n+| ipv6\\_type | `INTERNAL` or `EXTERNAL`. `INTERNAL` requires ULA be enabled on the VPC | string | - | no |\n---\nmodules/vpc/README.md\n@@ -31,6 +31,8 @@ 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+| enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n+| internal\\_ipv6\\_range | When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null) | `string` | `null` | 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 | `string` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `string` | n/a | yes |\n---\nmodules/vpc/main.tf\n@@ -25,6 +25,8 @@ resource \"google_compute_network\" \"network\" {\n description = var.description\n delete_default_routes_on_create = var.delete_default_internet_gateway_routes\n mtu = var.mtu\n+ enable_ula_internal_ipv6 = var.enable_ipv6_ula\n+ internal_ipv6_range = var.internal_ipv6_range\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -59,3 +59,15 @@ variable \"mtu\" {\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+variable \"enable_ipv6_ula\" {\n+ type = bool\n+ description = \"Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false')\"\n+ default = false\n+}\n+\n+variable \"internal_ipv6_range\" {\n+ type = string\n+ default = null\n+ description = \"When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null)\"\n+}\n---\n\n\n---\n\nChoice B:\nmodules/subnets-beta/README.md\n@@ -96,3 +96,6 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_metadata\\_fields | List of metadata fields that should be added to reported logs. Can only be specified if VPC flow logs for this subnetwork is enabled and \"metadata\" is set to CUSTOM_METADATA. | any | - | 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+| enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n+| internal\\_ipv6\\_range | When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null) | `string` | `null` | no |\n+\n---\nmodules/subnets-beta/main.tf\n@@ -62,8 +62,10 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n var.secondary_ranges[each.value.subnet_name][i]\n ]\n \n- purpose = lookup(each.value, \"purpose\", null)\n- role = lookup(each.value, \"role\", null)\n+ purpose = lookup(each.value, \"purpose\", null)\n+ role = lookup(each.value, \"role\", null)\n+ stack_type = lookup(each.value, \"stack\", null)\n+ ipv6_access_type = lookup(each.value, \"ipv6_type\", null)\n \n depends_on = [var.module_depends_on]\n }\n---\nmodules/subnets/README.md\n@@ -95,3 +95,5 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_metadata\\_fields | List of metadata fields that should be added to reported logs. Can only be specified if VPC flow logs for this subnetwork is enabled and \"metadata\" is set to CUSTOM_METADATA. | any | - | 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+| stack | `IPV4_ONLY` or `IPV4_IPV6` for dual-stack networking | string | - | no |\n+| ipv6\\_type | `INTERNAL` or `EXTERNAL`. `INTERNAL` requires ULA be enabled on the VPC | string | - | no |\n---\nmodules/vpc/README.md\n@@ -31,6 +31,8 @@ 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+| enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n+| internal\\_ipv6\\_range | When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null) | `string` | `null` | 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 | `string` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `string` | n/a | yes |\n---\nmodules/vpc/main.tf\n@@ -25,6 +25,8 @@ resource \"google_compute_network\" \"network\" {\n description = var.description\n delete_default_routes_on_create = var.delete_default_internet_gateway_routes\n mtu = var.mtu\n+ enable_ula_internal_ipv6 = var.enable_ipv6_ula\n+ internal_ipv6_range = var.internal_ipv6_range\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -59,3 +59,15 @@ variable \"mtu\" {\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 = `false` }\n+\n+variable \"enable_ipv6_ula\" {\n+ type = bool\n+ description = \"Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false')\"\n+ default = false\n+}\n+\n+variable \"internal_ipv6_range\" {\n+ type = string\n+ default = null\n+ description = \"When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null)\"\n+}\n---\n\n\n---\n\nChoice C:\nmodules/subnets-beta/README.md\n@@ -96,3 +96,6 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_metadata\\_fields | List of metadata fields that should be added to reported logs. Can only be specified if VPC flow logs for this subnetwork is enabled and \"metadata\" is set to CUSTOM_METADATA. | any | - | 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+| enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n+| internal\\_ipv6\\_range | When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null) | `string` | `null` | no |\n+\n---\nmodules/subnets-beta/main.tf\n@@ -62,8 +62,10 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n var.secondary_ranges[each.value.subnet_name][i]\n ]\n \n- purpose = lookup(each.value, \"purpose\", null)\n- role = lookup(each.value, \"role\", null)\n+ purpose = lookup(each.value, \"purpose\", null)\n+ role = lookup(each.value, \"role\", null)\n+ stack_type = lookup(each.value, \"stack\", null)\n+ ipv6_access_type = lookup(each.value, \"ipv6_type\", null)\n \n depends_on = [var.module_depends_on]\n }\n---\nmodules/subnets/README.md\n@@ -95,3 +95,5 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_metadata\\_fields | List of metadata fields that should be added to reported logs. Can only be specified if VPC flow logs for this subnetwork is enabled and \"metadata\" is set to CUSTOM_METADATA. | any | - | 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+| stack | `IPV4_ONLY` or `IPV4_IPV6` for dual-stack networking | string | - | no |\n+| ipv6\\_type | `INTERNAL` or `EXTERNAL`. `INTERNAL` requires ULA be enabled on the VPC | string | - | no |\n---\nmodules/vpc/README.md\n@@ -31,6 +31,8 @@ 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+| enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n+| internal\\_ipv6\\_range | When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null) | `string` | `null` | 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 | `string` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `string` | n/a | yes |\n---\nmodules/vpc/main.tf\n@@ -25,6 +25,8 @@ resource \"google_compute_network\" \"network\" {\n description = var.description\n delete_default_routes_on_create = var.delete_default_internet_gateway_routes\n mtu = var.mtu\n+ enable_ula_internal_ipv6 = var.enable_ipv6_ula\n+ internal_ipv6_range = var.internal_ipv6_range\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -59,3 +59,15 @@ variable \"mtu\" {\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+variable \"enable_ipv6_ula\" {\n+ type = bool\n+ description = \"Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false')\"\n+ default = false\n+}\n+\n+variable \"internal_ipv6_range\" {\n+ type = string\n+ default = null\n+ description = \"When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null)\"\n+}\n---\n\n\n---\n\nChoice D:\nmodules/subnets-beta/README.md\n@@ -96,3 +96,6 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_metadata\\_fields | List of metadata fields that should be added to reported logs. Can only be specified if VPC flow logs for this subnetwork is enabled and \"metadata\" is set to CUSTOM_METADATA. | any | - | 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+| enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n+| internal\\_ipv6\\_range | When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null) `string` | `null` | no |\n+\n---\nmodules/subnets-beta/main.tf\n@@ -62,8 +62,10 @@ resource \"google_compute_subnetwork\" \"subnetwork\" {\n var.secondary_ranges[each.value.subnet_name][i]\n ]\n \n- purpose = lookup(each.value, \"purpose\", null)\n- role = lookup(each.value, \"role\", null)\n+ purpose = lookup(each.value, \"purpose\", null)\n+ role = lookup(each.value, \"role\", null)\n+ stack_type = lookup(each.value, \"stack\", null)\n+ ipv6_access_type = lookup(each.value, \"ipv6_type\", null)\n \n depends_on = [var.module_depends_on]\n }\n---\nmodules/subnets/README.md\n@@ -95,3 +95,5 @@ The subnets list contains maps, where each object represents a subnet. Each map\n | subnet\\_flow\\_logs\\_metadata\\_fields | List of metadata fields that should be added to reported logs. Can only be specified if VPC flow logs for this subnetwork is enabled and \"metadata\" is set to CUSTOM_METADATA. | any | - | 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+| stack | `IPV4_ONLY` or `IPV4_IPV6` for dual-stack networking | string | - | no |\n+| ipv6\\_type | `INTERNAL` or `EXTERNAL`. `INTERNAL` requires ULA be enabled on the VPC | string | - | no |\n---\nmodules/vpc/README.md\n@@ -31,6 +31,8 @@ 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+| enable\\_ipv6\\_ula | Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false') | `bool` | `false` | no |\n+| internal\\_ipv6\\_range | When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default null) | `string` | `null` | 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 | `string` | n/a | yes |\n | project\\_id | The ID of the project where this VPC will be created | `string` | n/a | yes |\n---\nmodules/vpc/main.tf\n@@ -25,6 +25,8 @@ resource \"google_compute_network\" \"network\" {\n description = var.description\n delete_default_routes_on_create = var.delete_default_internet_gateway_routes\n mtu = var.mtu\n+ enable_ula_internal_ipv6 = var.enable_ipv6_ula\n+ internal_ipv6_range = var.internal_ipv6_range\n }\n \n /******************************************\n---\nmodules/vpc/variables.tf\n@@ -59,3 +59,15 @@ variable \"mtu\" {\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+variable \"enable_ipv6_ula\" {\n+ type = bool\n+ description = \"Enabled IPv6 ULA, this is a permenant change and cannot be undone! (default 'false')\"\n+ default = false\n+}\n+\n+variable \"internal_ipv6_range\" {\n+ type = string\n+ default = null\n+ description = \"When enabling IPv6 ULA, optionally, specify a /48 from fd20::/20 (default 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:\nUpdating this file to acomodate the network_name in the Main.tf file\n\n---\n\nChoice A:\nexamples/simple_project/main.tf\n@@ -25,7 +25,7 @@ module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n version = \"~> 7.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n- network_name = \"my-custom-mode-network\"\n+ network_name = \"var.network_name\"\n mtu = 1460\n \n subnets = [\n---\nexamples/simple_project/variables.tf\n@@ {\n+ +17,6 @@\n variable \"project_id\" {\n description = \"The project ID to host the network in\"\n }\n+variable \"network_name\" {\n+ description = \"The VPC network name\"\n+}\n---\n\n\n---\n\nChoice B:\nexamples/simple_project/main.tf\n@@ -25,7 +25,7 @@ module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n version = \"~> 7.0\"\n project_id = var.project_id # Replace this with your project ID in network_name = \"my-custom-mode-network\"\n+ network_name = \"var.network_name\"\n mtu = 1460\n \n subnets = [\n---\nexamples/simple_project/variables.tf\n@@ -17,3 +17,6 @@\n variable \"project_id\" {\n description = \"The project ID to host the network in\"\n }\n+variable \"network_name\" {\n+ description = \"The VPC network name\"\n+}\n---\n\n\n---\n\nChoice C:\nexamples/simple_project/main.tf\n@@ -25,7 +25,7 @@ module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n version = \"~> 7.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n- network_name = \"my-custom-mode-network\"\n+ network_name = \"var.network_name\"\n mtu = 1460\n \n subnets = [\n---\nexamples/simple_project/variables.tf\n@@ -17,3 +17,6 @@\n variable \"project_id\" {\n description = \"The project ID to host the network in\"\n }\n+variable \"network_name\" {\n+ description = \"The VPC network name\"\n+}\n---\n\n\n---\n\nChoice D:\nexamples/simple_project/main.tf\n@@ -25,7 +25,7 @@ module \"test-vpc-module\" {\n source = \"terraform-google-modules/network/google\"\n version = \"~> 7.0\"\n project_id = var.project_id # Replace this with your project ID in quotes\n- network_name \"my-custom-mode-network\"\n+ network_name = \"var.network_name\"\n mtu = 1460\n \n subnets = [\n---\nexamples/simple_project/variables.tf\n@@ -17,3 +17,6 @@\n variable \"project_id\" {\n description = \"The project ID to host the network in\"\n }\n+variable \"network_name\" {\n+ description = \"The VPC network name\"\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## [7.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.0.0...v7.1.0) (2023-06-27)\n\n\n### Features\n\n* add destination_ranges and source_ranges in firewall rules ([#464](https://github.com/terraform-google-modules/terraform-google-network/issues/464)) ([83a7e85](https://github.com/terraform-google-modules/terraform-google-network/commit/83a7e85ec0085309d41e103d959eecf17c7a6b14))\n* added network firewall policy sub-module ([#453](https://github.com/terraform-google-modules/terraform-google-network/issues/453)) ([7b197c6](https://github.com/terraform-google-modules/terraform-google-network/commit/7b197c6448c13bb5664f7865d42890b8d2fba7e1))\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+## [7.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.0.0...v7.1.0) (2023-06-27)\n+\n+\n+### Features\n+\n+* add destination_ranges and source_ranges in firewall rules ([#464](https://github.com/terraform-google-modules/terraform-google-network/issues/464)) ([83a7e85](https://github.com/terraform-google-modules/terraform-google-network/commit/83a7e85ec0085309d41e103d959eecf17c7a6b14))\n+* added network firewall policy sub-module ([#453](https://github.com/terraform-google-modules/terraform-google-network/issues/453)) ([7b197c6](https://github.com/terraform-google-modules/terraform-google-network/commit/7b197c6448c13bb5664f7865d42890b8d2fba7e1))\n+\n ## [7.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.1...v7.0.0) (2023-04-13)\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 = \"~> 7.0\"\n+ version = \"~> 7.1\"\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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.1.0\"\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.1.0\"\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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.1.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.1.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.1.0\"\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+## [7.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.0.0...v7.1.0) (2023-06-27)\n+\n+\n+### Features\n+\n+* add destination_ranges and source_ranges in firewall rules ([#464](https://github.com/terraform-google-modules/terraform-google-network/issues/464)) ([83a7e85](https://github.com/terraform-google-modules/terraform-google-network/commit/83a7e85ec0085309d41e103d959eecf17c7a6b14))\n+* added network firewall policy sub-module ([#453](https://github.com/terraform-google-modules/terraform-google-network/issues/453)) ([7b197c6](https://github.com/terraform-google-modules/terraform-google-network/commit/7b197c6448c13bb5664f7865d42890b8d2fba7e1))\n+\n ## [7.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.1...v7.0.0) (2023-04-13)\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 = \"~> 7.0\"\n+ version = \"~> 7.1\"\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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.1.0\"\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.1.0\"\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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.1.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.1.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.1.0\"\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+## [7.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.0.0...v7.1.0) (2023-06-27)\n+\n+\n+### Features\n+\n+* add destination_ranges and source_ranges in firewall rules ([#464](https://github.com/terraform-google-modules/terraform-google-network/issues/464)) ([83a7e85](https://github.com/terraform-google-modules/terraform-google-network/commit/83a7e85ec0085309d41e103d959eecf17c7a6b14))\n+* added network firewall policy sub-module ([#453](https://github.com/terraform-google-modules/terraform-google-network/issues/453)) ([7b197c6](https://github.com/terraform-google-modules/terraform-google-network/commit/7b197c6448c13bb5664f7865d42890b8d2fba7e1))\n+\n ## [7.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.1...v7.0.0) (2023-04-13)\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 = \"~> 7.0\"\n+ version = \"~> 7.1\"\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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.1.0\"\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.1.0\"\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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.1.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.1.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.1.0\"\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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.1.0\"\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+## [7.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.0.0...v7.1.0) (2023-06-27)\n+\n+\n+### Features\n+\n+* add destination_ranges and source_ranges in firewall rules ([#464](https://github.com/terraform-google-modules/terraform-google-network/issues/464)) ([83a7e85](https://github.com/terraform-google-modules/terraform-google-network/commit/83a7e85ec0085309d41e103d959eecf17c7a6b14))\n+* added network firewall policy sub-module ([#453](https://github.com/terraform-google-modules/terraform-google-network/issues/453)) ([7b197c6](https://github.com/terraform-google-modules/terraform-google-network/commit/7b197c6448c13bb5664f7865d42890b8d2fba7e1))\n+\n ## [7.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.1...v7.0.0) (2023-04-13)\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 = \"~> 7.0\"\n+ version = \"~> 7.1\"\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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.1.0\"\n }\n }\n---\nmodules/network-firewall-policy/versions.tf\n@@ -29,6 +29,6 @@ terraform {\n }\n \n provider_meta \"google\" {\n- module_name = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.0.0\"\n+ = \"blueprints/terraform/terraform-google-network:network-firewall-policy/v7.1.0\"\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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.1.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.1.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.1.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.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/v7.0.0\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.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:\nNoticed the readme links pointing to the wrong repo\n\n---\n\nChoice A:\nmodules/network-firewall-policy/README.md\n@@ -24,7 +24,7 @@ module \"firewall_rules\" {\n \n ## Usage\n \n-There are examples included for [global](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/regional-network-firewall-policy) firewall policies in the [examples](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/) folder. Basic usage of this module is as follows:\n+There are examples included for [global](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/regional-network-firewall-policy) firewall policies in the [examples](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/) folder. Basic usage of this module is as follows:\n \n ```hcl\n module \"firewall_rules\" {\n@@ Some +150,7 @@ module \"firewall_rules\" {\n \n ## Firwall Policy Rules Format\n \n-In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-policies-rule-details), you specify a set of components that define what the rule does. Some of the values are optional and some have default value. See [Inputs](#Inputs). For sample code check [global](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/regional-network-firewall-policy) in [examples](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/) folder.\n+In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-policies-rule-details), you specify a set of components that define what the rule does. Some of the values are optional and some have default value. See [Inputs](#Inputs). For sample code check [global](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/regional-network-firewall-policy) in [examples](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/) folder.\n \n - `priority`: An integer indicating the priority of a rule in the list. The `priority` must be a positive value between 0 and 2147483647 and It has to be unique for every rule.\n - `dest_fqdns`, `dest_region_codes`, `dest_threat_intelligences` and `dest_address_groups` values are not needed and ignored by the this for `INGRESS` policies.\n---\n\n\n---\n\nChoice B:\nmodules/network-firewall-policy/README.md\n@@ -24,7 +24,7 @@ module \"firewall_rules\" {\n \n ## Usage\n \n-There are examples included for [global](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/regional-network-firewall-policy) firewall policies in the [examples](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/) folder. Basic usage of this module is as follows:\n+There are examples included for [global](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/regional-network-firewall-policy) firewall policies in the [examples](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/) folder. Basic usage of this module is as follows:\n \n ```hcl\n module \"firewall_rules\" {\n@@ -150,7 +150,7 @@ module \"firewall_rules\" {\n \n ## Firwall Policy Rules Format\n \n-In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-policies-rule-details), you specify a set of components that define what the rule does. Some of the values are optional and some have default value. See [Inputs](#Inputs). For sample code check [global](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/regional-network-firewall-policy) in [examples](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/) folder.\n+In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-policies-rule-details), you specify a set of components that define what the rule does. Some of the values are optional and some have default value. See [Inputs](#Inputs). For sample code check [global](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/regional-network-firewall-policy) in [examples](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/) folder.\n \n - `priority`: An integer indicating the priority of a rule in the list. The `priority` must be a positive value between 0 and 2147483647 and It has to be unique for every rule.\n - `dest_fqdns`, `dest_region_codes`, `dest_threat_intelligences` and `dest_address_groups` and are not needed and ignored by the this for `INGRESS` policies.\n---\n\n\n---\n\nChoice C:\nmodules/network-firewall-policy/README.md\n@@ -24,7 +24,7 @@ module \"firewall_rules\" {\n \n ## Usage\n \n-There are examples included for [global](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/regional-network-firewall-policy) firewall policies in the [examples](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/) folder. Basic usage of this module is as follows:\n+There are examples included for [global](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/regional-network-firewall-policy) firewall policies in the [examples](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/) folder. Basic usage of this module is as follows:\n \n ```hcl\n module \"firewall_rules\" {\n@@ -150,7 +150,7 @@ module \"firewall_rules\" {\n \n ## Firwall Policy Rules Format\n \n-In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-policies-rule-details), you specify a set of components that define what the rule does. Some of the values are optional and some have default value. See [Inputs](#Inputs). For sample code check [global](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/regional-network-firewall-policy) in [examples](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/) folder.\n+In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-policies-rule-details), you specify a set of components that define what the rule does. Some of the values are optional and some have default value. See [Inputs](#Inputs). For sample code check [global](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/regional-network-firewall-policy) in [examples](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/) folder.\n \n - `priority`: An integer indicating the priority of a rule in the list. The `priority` must be a positive value between 0 and 2147483647 and It has to be unique for every rule.\n - `dest_fqdns`, `dest_region_codes`, `dest_threat_intelligences` and `dest_address_groups` values are not needed and ignored by the this for `INGRESS` policies.\n---\n\n\n---\n\nChoice D:\nmodules/network-firewall-policy/README.md\n@@ -24,7 +24,7 @@ module \"firewall_rules\" {\n \n ## Usage\n \n-There are examples included for [global](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/regional-network-firewall-policy) firewall policies in the [examples](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/) folder. Basic usage of this module is as follows:\n+There are examples included for [global](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/regional-network-firewall-policy) firewall policies in the [examples](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/) folder. Basic usage of this module is as follows:\n \n ```hcl\n module \"firewall_rules\" {\n@@ -150,7 +150,7 @@ module \"firewall_rules\" {\n \n ## Firwall Policy in Format\n \n-In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-policies-rule-details), you specify a set of components that define what the rule does. Some of the values are optional and some have default value. See [Inputs](#Inputs). For sample code check [global](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/regional-network-firewall-policy) in [examples](https://github.com/terraform-google-modules/terraform-google-lb-http/tree/master/examples/) folder.\n+In a [firewall policy rule](https://cloud.google.com/firewall/docs/firewall-policies-rule-details), you specify a set of components that define what the rule does. Some of the values are optional and some have default value. See [Inputs](#Inputs). For sample code check [global](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/global-network-firewall-policy) and [regional](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/regional-network-firewall-policy) in [examples](https://github.com/terraform-google-modules/terraform-google-network/tree/master/examples/) folder.\n \n - `priority`: An integer indicating the priority of a rule in the list. The `priority` must be a positive value between 0 and 2147483647 and It has to be unique for every rule.\n - `dest_fqdns`, `dest_region_codes`, `dest_threat_intelligences` and `dest_address_groups` values are not needed and ignored by the this for `INGRESS` policies.\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:\nNote: This PR relies on behavior that is currently in preview.\r\n\r\nThe `firewall_rules` module currently accepts only a single `ranges` input, which is used for one of `destination_ranges` or `source_ranges` depending upon the rule `type`.\r\n\r\nThis PR adds explicit `source_ranges` and `destination_ranges` inputs, which will allow rules to specify both a source and destination range set.\r\n\r\nThe `ranges` input has been marked as deprecated. However, the original behavior has been maintained for backwards compatibility.\r\n\r\n## Background\r\nFor INGRESS rules, it is now possible to restrict incoming packets to those with a certain destination by specifying `destination_ranges`.\r\n\r\nFor EGRESS rules, the set of allowed sources can be further restricted by specifying `source_ranges`.\r\n\r\nFrom the docs: \r\n\r\n(https://cloud.google.com/vpc/docs/firewalls#targets_and_ips_ingress)\r\n> If the ingress firewall rule includes a destination IP address range, the packet's destination must fit within one of the explicitly defined destination IP address ranges\r\n\r\n(https://cloud.google.com/vpc/docs/firewalls#targets_and_ips_egress)\r\n> If the egress firewall rule includes source IP address ranges, the target VMs are still limited to the source IP addresses mentioned previously, but the source parameter can be used to refine that set \r\n\r\nBREAKING CHANGE: adding new properties to `rules` object will require caller to pass in those properties. Terraform provides optional types, but they are not supported in this repo's minimum TF version of 12.6.\n\n---\n\nChoice A:\nmodules/firewall-rules/README.md\n@@ -41,7 +41,7 @@ module \"firewall_rules\" {\n |------|-------------|------|---------|:--------:|\n | network\\_name | 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-| 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). | <pre>list(object({<br> name = string<br> description = string<br> direction = string<br> priority = number<br><br> # Deprecated; use source_ranges or destination_ranges instead.<br> # For rule of type INGRESS, will be used as source_ranges if not defined.<br> # For rule of type EGRESS, will be used as destination_ranges if not defined.<br> ranges = list(string)<br><br> source_ranges = list(string)<br> destination_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 \n ## Outputs\n \n---\nmodules/firewall-rules/main.tf\n@@ -21,8 +21,8 @@ resource \"google_compute_firewall\" \"rules\" {\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_ranges = coalesce(each.value.source_ranges, each.value.direction == \"INGRESS\" ? each.value.ranges : null)\n+ destination_ranges = coalesce(each.value.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---\nmodules/firewall-rules/variables.tf\n@@ -32,7 +32,12 @@ variable \"rules\" {\n description = string\n direction = string\n priority = number\n+ # Deprecated; use source_ranges or destination_ranges instead.\n+ # For rule of type INGRESS, will be used as source_ranges if not defined.\n+ # For rule of type EGRESS, will be used as destination_ranges if not defined.\n ranges = list(string)\n+ source_ranges = list(string)\n+ destination_ranges = list(string)\n source_tags = list(string)\n source_service_accounts = list(string)\n target_tags = list(string)\n---\n\n\n---\n\nChoice B:\nmodules/firewall-rules/README.md\n@@ -41,7 +41,7 @@ module \"firewall_rules\" {\n |------|-------------|------|---------|:--------:|\n | network\\_name | 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-| 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). | <pre>list(object({<br> name = string<br> description = string<br> direction = string<br> priority = number<br><br> # Deprecated; use source_ranges or destination_ranges instead.<br> # For rule of type INGRESS, will be used as source_ranges if not defined.<br> # For rule of type EGRESS, will be used as destination_ranges if not defined.<br> ranges = list(string)<br><br> source_ranges = list(string)<br> destination_ranges = list(string)<br> source_tags = list(string)<br> source_service_accounts = list(string)<br> type = 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 \n ## Outputs\n \n---\nmodules/firewall-rules/main.tf\n@@ -21,8 +21,8 @@ resource \"google_compute_firewall\" \"rules\" {\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_ranges = coalesce(each.value.source_ranges, each.value.direction == \"INGRESS\" ? each.value.ranges : null)\n+ destination_ranges = coalesce(each.value.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---\nmodules/firewall-rules/variables.tf\n@@ -32,7 +32,12 @@ variable \"rules\" {\n description = string\n direction = string\n priority = number\n+ # Deprecated; use source_ranges or destination_ranges instead.\n+ # For rule of type INGRESS, will be used as source_ranges if not defined.\n+ # For rule of type EGRESS, will be used as destination_ranges if not defined.\n ranges = list(string)\n+ source_ranges = list(string)\n+ destination_ranges = list(string)\n source_tags = list(string)\n source_service_accounts = list(string)\n target_tags = list(string)\n---\n\n\n---\n\nChoice C:\nmodules/firewall-rules/README.md\n@@ -41,7 +41,7 @@ module \"firewall_rules\" {\n |------|-------------|------|---------|:--------:|\n | network\\_name | 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-| 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). | <pre>list(object({<br> name = string<br> description = string<br> direction = string<br> priority = number<br><br> # Deprecated; use source_ranges or destination_ranges instead.<br> # For rule of type INGRESS, will be used as source_ranges if not defined.<br> # For rule of type EGRESS, will be used as destination_ranges if not defined.<br> ranges = list(string)<br><br> source_ranges = list(string)<br> destination_ranges = list(string)<br> source_tags = list(string)<br> source_service_accounts = list(string)<br> target_tags = list(string)<br> = 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 \n ## Outputs\n \n---\nmodules/firewall-rules/main.tf\n@@ -21,8 +21,8 @@ resource \"google_compute_firewall\" \"rules\" {\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_ranges = coalesce(each.value.source_ranges, each.value.direction == \"INGRESS\" ? each.value.ranges : null)\n+ destination_ranges = coalesce(each.value.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---\nmodules/firewall-rules/variables.tf\n@@ -32,7 +32,12 @@ variable \"rules\" {\n description = string\n direction = string\n priority = number\n+ # Deprecated; use source_ranges or destination_ranges instead.\n+ # For rule of type INGRESS, will be used as source_ranges if not defined.\n+ # For rule of type EGRESS, will be used as destination_ranges if not defined.\n ranges = list(string)\n+ source_ranges = list(string)\n+ destination_ranges = list(string)\n source_tags = list(string)\n source_service_accounts = list(string)\n target_tags = list(string)\n---\n\n\n---\n\nChoice D:\nmodules/firewall-rules/README.md\n@@ -41,7 +41,7 @@ module \"firewall_rules\" {\n |------|-------------|------|---------|:--------:|\n | network\\_name | 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-| 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). | <pre>list(object({<br> name = string<br> description = string<br> direction = string<br> priority = number<br><br> # Deprecated; use source_ranges or destination_ranges instead.<br> # For rule of type INGRESS, will be used as source_ranges if not defined.<br> # For rule of type EGRESS, will be used as destination_ranges if not defined.<br> ranges = list(string)<br><br> source_ranges = list(string)<br> destination_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 \n ## Outputs\n \n---\nmodules/firewall-rules/main.tf\n@@ -21,8 +21,8 @@ resource \"google_compute_firewall\" \"rules\" {\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_ranges = coalesce(each.value.source_ranges, each.value.direction == \"INGRESS\" ? each.value.ranges : null)\n+ destination_ranges = coalesce(each.value.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---\nmodules/firewall-rules/variables.tf\n@@ -32,7 +32,12 @@ variable \"rules\" {\n description = string\n direction = string\n priority = number\n+ # Deprecated; use source_ranges or destination_ranges instead.\n+ # For rule of type INGRESS, will be used as source_ranges if not defined.\n+ # For rule of type EGRESS, will be used as destination_ranges if not defined.\n ranges = list(string)\n+ source_ranges = list(string)\n+ destination_ranges = list(string)\n source_tags = list(string)\n source_service_accounts = list(string)\n target_tags = list(string)\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.18` -> `1.20` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go</summary>\n\n### [`v1.20.5`](https://togithub.com/golang/go/compare/go1.20.4...go1.20.5)\n\n### [`v1.20.4`](https://togithub.com/golang/go/compare/go1.20.3...go1.20.4)\n\n### [`v1.20.3`](https://togithub.com/golang/go/compare/go1.20.2...go1.20.3)\n\n### [`v1.20.2`](https://togithub.com/golang/go/compare/go1.20.1...go1.20.2)\n\n### [`v1.20.1`](https://togithub.com/golang/go/compare/go1.19.10...go1.20.1)\n\n### [`v1.19.10`](https://togithub.com/golang/go/compare/go1.19.9...go1.19.10)\n\n### [`v1.19.9`](https://togithub.com/golang/go/compare/go1.19.8...go1.19.9)\n\n### [`v1.19.8`](https://togithub.com/golang/go/compare/go1.19.7...go1.19.8)\n\n### [`v1.19.7`](https://togithub.com/golang/go/compare/go1.19.6...go1.19.7)\n\n### [`v1.19.6`](https://togithub.com/golang/go/compare/go1.19.5...go1.19.6)\n\n### [`v1.19.5`](https://togithub.com/golang/go/compare/go1.19.4...go1.19.5)\n\n### [`v1.19.4`](https://togithub.com/golang/go/compare/go1.19.3...go1.19.4)\n\n### [`v1.19.3`](https://togithub.com/golang/go/compare/go1.19.2...go1.19.3)\n\n### [`v1.19.2`](https://togithub.com/golang/go/compare/go1.19.1...go1.19.2)\n\n### [`v1.19.1`](https://togithub.com/golang/go/compare/go1.18.10...go1.19.1)\n\n### [`v1.18.10`](https://togithub.com/golang/go/compare/go1.18.9...go1.18.10)\n\n### [`v1.18.9`](https://togithub.com/golang/go/compare/go1.18.8...go1.18.9)\n\n### [`v1.18.8`](https://togithub.com/golang/go/compare/go1.18.7...go1.18.8)\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.17.13...go1.18.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:eyJjcmVhdGVkSW5WZXIiOiIzNS4xMTcuMyIsInVwZGF0ZWRJblZlciI6IjM1LjExNy4zIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -1,6 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.18\n+go 1.20\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.2\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -1,6 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go test/integration/go.mod\n@@ 1.20\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.2\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ module +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n \n-go 1.18\n+go 1.20\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.2\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -1,6 +1,6 @@\n module github.com/terraform-google-modules/terraform-google-network/test/integration\n 1.20\n 1.18\n+go 1.20\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.2\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:\noutputs added to google's module\n\n---\n\nChoice A:\nPROSPER_README.md\n@@ -0,0 +1 @@\n+./outputs.tf modified - GB\n\\ No newline at end of file\n---\noutputs.tf\n@@ -88,3 +88,9 @@ output \"route_names\" {\n value = [for route in module.routes.routes : route.name]\n description = \"The route names associated with this VPC\"\n }\n+\n+# Custom output - GB\n+output \"subnets_ips_v6\" {\n+ value = [for network in module.subnets.subnets : network.external_ipv6_prefix]\n+ description = \"The IPs and CIDRs of the subnets being created (v6)\"\n+}\n\\ No newline at end of file\n---\n\n\n---\n\nChoice B:\nPROSPER_README.md\n@@ -0,0 +1 @@\n+./outputs.tf modified - GB\n\\ No newline at end of file\n---\noutputs.tf\n@@ -88,3 +88,9 @@ output \"route_names\" {\n value = [for route in module.routes.routes : route.name]\n description = \"The route names associated with this route.name]\n }\n+\n+# Custom output added - GB\n+output \"subnets_ips_v6\" {\n+ value = [for network in module.subnets.subnets : network.external_ipv6_prefix]\n+ description = \"The IPs and CIDRs of the subnets being created (v6)\"\n+}\n\\ No newline at end of file\n---\n\n\n---\n\nChoice C:\nPROSPER_README.md\n@@ -0,0 +1 @@\n+./outputs.tf modified - GB\n\\ No newline at end of file\n---\noutputs.tf\n@@ -88,3 +88,9 @@ output \"route_names\" {\n = [for route in module.routes.routes : route.name]\n description = \"The route names associated with this VPC\"\n }\n+\n+# Custom output added - GB\n+output \"subnets_ips_v6\" {\n+ value = [for network in module.subnets.subnets : network.external_ipv6_prefix]\n+ description = \"The IPs and CIDRs of the subnets being created (v6)\"\n+}\n\\ No newline at end of file\n---\n\n\n---\n\nChoice D:\nPROSPER_README.md\n@@ -0,0 +1 @@\n+./outputs.tf modified - GB\n\\ No newline at end of file\n---\noutputs.tf\n@@ -88,3 +88,9 @@ output \"route_names\" {\n value = [for route in module.routes.routes : route.name]\n description = \"The route names associated with this VPC\"\n }\n+\n+# Custom output added - GB\n+output \"subnets_ips_v6\" {\n+ value = [for network in module.subnets.subnets : network.external_ipv6_prefix]\n+ description = \"The IPs and CIDRs of the subnets being created (v6)\"\n+}\n\\ No newline at end of file\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 | Update | Change |\n|---|---|---|\n| cft/developer-tools | minor | `1.12` -> `1.13` |\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:eyJjcmVhdGVkSW5WZXIiOiIzNS4xMTUuMiIsInVwZGF0ZWRJblZlciI6IjM1LjExNS4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->\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.12\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.13\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -201,4 +201,4 @@ substitutions:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.12'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.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: '1.12'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'\n---\n\n\n---\n\nChoice B:\nMakefile\n@@ -15,7 +15,7 @@\n # Make will use bash of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.12\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.13\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -201,4 +201,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.12'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.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: '1.12'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'\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.12\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.13\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -201,4 +201,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.12'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.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: '1.12'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'\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.12\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.13\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n REGISTRY_URL := gcr.io/cloud-foundation-cicd\n \n---\nbuild/int.cloudbuild.yaml\n@@ -201,4 +201,4 @@ tags:\n - 'integration'\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.12'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.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: '1.12'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'\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/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | minor | `v0.42.0` -> `v0.43.0` |\n| [github.com/stretchr/testify](https://togithub.com/stretchr/testify) | require | patch | `v1.8.3` -> `v1.8.4` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.43.0`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.43.0)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.42.0...v0.43.0)\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` \\[BACKWARD INCOMPATIBLE]\n\n#### Description\n\n- Updated minimal Go version to 1.19\n- Updated Kubernetes client dependency\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/1298](https://togithub.com/gruntwork-io/terratest/pull/1298)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n</details>\n\n<details>\n<summary>stretchr/testify</summary>\n\n### [`v1.8.4`](https://togithub.com/stretchr/testify/compare/v1.8.3...v1.8.4)\n\n[Compare Source](https://togithub.com/stretchr/testify/compare/v1.8.3...v1.8.4)\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://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:eyJjcmVhdGVkSW5WZXIiOiIzNS4xMTAuMCIsInVwZGF0ZWRJblZlciI6IjM1LjExMC4wIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -4,8 +4,8 @@ go 1.18\n \n h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.2\n-\tgithub.com/gruntwork-io/terratest v0.42.0\n-\tgithub.com/stretchr/testify v1.8.3\n+\tgithub.com/gruntwork-io/terratest v0.43.0\n+\tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.14.4\n )\n \n---\ntest/integration/go.sum\n@@ -350,8 +350,8 @@ github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK6\n github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=\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.42.0 h1:j3HKRzZ7p4f1iweP2stDSYz+am4+JIbraTehiEWc77s=\n-github.com/gruntwork-io/terratest v0.42.0/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.43.0 h1:/ewxlYwd/HBralCt7P2bAhYM8hdkOiFJHrMz5XdlsSY=\n+github.com/gruntwork-io/terratest v0.43.0/go.mod h1:vZO4J6UW023NDvl1vI+twZk9r//+QEaNT6MfkheH7z0=\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@@ -429,8 +429,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=\n-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n github.com/tidwall/gjson v1.14.2/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---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -4,8 +4,8 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.2\n-\tgithub.com/gruntwork-io/terratest v0.42.0\n-\tgithub.com/stretchr/testify v1.8.3\n+\tgithub.com/gruntwork-io/terratest v0.43.0\n+\tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.14.4\n )\n \n---\ntest/integration/go.sum\n@@ -350,8 +350,8 @@ github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK6\n github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=\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.42.0 h1:j3HKRzZ7p4f1iweP2stDSYz+am4+JIbraTehiEWc77s=\n-github.com/gruntwork-io/terratest v0.42.0/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.43.0 h1:/ewxlYwd/HBralCt7P2bAhYM8hdkOiFJHrMz5XdlsSY=\n+github.com/gruntwork-io/terratest v0.43.0/go.mod h1:vZO4J6UW023NDvl1vI+twZk9r//+QEaNT6MfkheH7z0=\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 v1.0.0/go.mod v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n@@ -429,8 +429,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=\n-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n github.com/tidwall/gjson v1.14.2/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---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -4,8 +4,8 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.2\n-\tgithub.com/gruntwork-io/terratest v0.42.0\n-\tgithub.com/stretchr/testify v1.8.3\n+\tgithub.com/gruntwork-io/terratest v0.43.0\n+\tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.14.4\n )\n \n---\ntest/integration/go.sum\n@@ -350,8 +350,8 @@ github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK6\n github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=\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.42.0 h1:j3HKRzZ7p4f1iweP2stDSYz+am4+JIbraTehiEWc77s=\n-github.com/gruntwork-io/terratest v0.42.0/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.43.0 h1:/ewxlYwd/HBralCt7P2bAhYM8hdkOiFJHrMz5XdlsSY=\n+github.com/gruntwork-io/terratest v0.43.0/go.mod h1:vZO4J6UW023NDvl1vI+twZk9r//+QEaNT6MfkheH7z0=\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@@ -429,8 v1.0.0/go.mod @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=\n-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n github.com/tidwall/gjson v1.14.2/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---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -4,8 +4,8 @@ go 1.18\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.2\n-\tgithub.com/gruntwork-io/terratest v0.42.0\n-\tgithub.com/stretchr/testify v1.8.3\n+\tgithub.com/gruntwork-io/terratest v0.43.0\n+\tgithub.com/stretchr/testify v1.8.4\n \tgithub.com/tidwall/gjson v1.14.4\n )\n \n---\ntest/integration/go.sum\n@@ -350,8 +350,8 @@ github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK6\n github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=\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.42.0 h1:j3HKRzZ7p4f1iweP2stDSYz+am4+JIbraTehiEWc77s=\n-github.com/gruntwork-io/terratest v0.42.0/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.43.0 h1:/ewxlYwd/HBralCt7P2bAhYM8hdkOiFJHrMz5XdlsSY=\n+github.com/gruntwork-io/terratest v0.43.0/go.mod h1:vZO4J6UW023NDvl1vI+twZk9r//+QEaNT6MfkheH7z0=\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@@ -429,8 +429,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/\n github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=\n github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=\n github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=\n-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=\n-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=\n+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=\n github.com/tidwall/gjson v1.14.2/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---\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:\nAs you can understand from `compute_shared_instance_with_reserved_ip_create`, this compute instance was supposed to created with reserved ip address.\r\n\r\nfixes: b/275008920\n\n---\n\nChoice A:\nexamples/basic_shared_vpc/main.tf\n@@ -57,7 +57,7 @@ resource \"google_compute_address\" \"internal\" {\n resource \"google_compute_instance\" \"reserved_ip\" {\n project = var.service_project\n zone = \"us-central1-a\"\n- name = google_compute_address.internal.self_link\n+ name = \"reserved-ip-instance\"\n machine_type = \"e2-medium\"\n boot_disk {\n initialize_params {\n@@ -66,7 +66,7 @@ resource \"google_compute_instance\" \"reserved_ip\" {\n }\n network_interface {\n subnetwork = data.google_compute_subnetwork.subnet.self_link\n- network_ip = \"int-ip\"\n+ network_ip = google_compute_address.internal.address\n }\n }\n # [END compute_shared_instance_with_reserved_ip_create]\n---\n\n\n---\n\nChoice B:\nexamples/basic_shared_vpc/main.tf\n@@ -57,7 +57,7 @@ resource \"google_compute_address\" \"internal\" {\n resource \"google_compute_instance\" \"reserved_ip\" {\n project = var.service_project\n zone \"us-central1-a\"\n- name = google_compute_address.internal.self_link\n+ name = \"reserved-ip-instance\"\n machine_type = \"e2-medium\"\n boot_disk {\n initialize_params {\n@@ -66,7 +66,7 @@ resource \"google_compute_instance\" \"reserved_ip\" {\n }\n network_interface {\n subnetwork = data.google_compute_subnetwork.subnet.self_link\n- network_ip = \"int-ip\"\n+ network_ip = google_compute_address.internal.address\n }\n }\n # [END compute_shared_instance_with_reserved_ip_create]\n---\n\n\n---\n\nChoice C:\nexamples/basic_shared_vpc/main.tf\n@@ -57,7 +57,7 @@ resource \"google_compute_address\" \"internal\" {\n resource \"google_compute_instance\" \"reserved_ip\" {\n project = var.service_project\n zone = \"us-central1-a\"\n- name = google_compute_address.internal.self_link\n+ name = \"reserved-ip-instance\"\n machine_type = \"e2-medium\"\n boot_disk {\n initialize_params {\n@@ -66,7 +66,7 @@ resource \"google_compute_instance\" \"reserved_ip\" {\n }\n network_interface {\n subnetwork = data.google_compute_subnetwork.subnet.self_link\n- network_ip = \"int-ip\"\n+ network_ip = google_compute_address.internal.address\n }\n }\n # [END compute_shared_instance_with_reserved_ip_create]\n---\n\n\n---\n\nChoice D:\nexamples/basic_shared_vpc/main.tf\n@@ -57,7 +57,7 @@ resource \"google_compute_address\" \"internal\" {\n resource \"google_compute_instance\" \"reserved_ip\" {\n project = var.service_project\n zone = \"us-central1-a\"\n- name = google_compute_address.internal.self_link\n+ name = \"reserved-ip-instance\"\n machine_type = \"e2-medium\"\n boot_disk {\n initialize_params {\n@@ -66,7 +66,7 @@ resource \"google_compute_instance\" \"reserved_ip\" {\n }\n network_interface {\n machine_type subnetwork = data.google_compute_subnetwork.subnet.self_link\n- network_ip = \"int-ip\"\n+ network_ip = google_compute_address.internal.address\n }\n }\n # [END compute_shared_instance_with_reserved_ip_create]\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/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | minor | `v0.41.26` -> `v0.42.0` | `v0.43.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.42.0`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.42.0)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.26...v0.42.0)\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- `helm` \\[BACKWARD INCOMPATIBLE]\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- Fixed the description of `k8s.KubectlApplyFromKustomizeE` which refered to \"delete\".\n- Updated `helm.Options` struct with flag `BuildDependencies`, once set, helm chart dependencies building will be performed.\n\n#### Migration guide\n\nFor helm charts that require dependencies to be built, should be defined `helm.BuildDependencies=true`\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- [@​s-diez](https://togithub.com/s-diez)\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/1294](https://togithub.com/gruntwork-io/terratest/pull/1294)\n- [https://github.com/gruntwork-io/terratest/pull/1289](https://togithub.com/gruntwork-io/terratest/pull/1289)\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:eyJjcmVhdGVkSW5WZXIiOiIzNS4xMDIuMTAiLCJ1cGRhdGVkSW5WZXIiOiIzNS4xMDIuMTAiLCJ0YXJnZXRCcmFuY2giOiJtYXN0ZXIifQ==-->\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.2\n-\tgithub.com/gruntwork-io/terratest v0.41.26\n+\tgithub.com/gruntwork-io/terratest v0.42.0\n \tgithub.com/stretchr/testify v1.8.3\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -350,8 +350,8 @@ github.com/googleapis/gax-go/v2 h1:j3HKRzZ7p4f1iweP2stDSYz+am4+JIbraTehiEWc77s=\n+github.com/gruntwork-io/terratest h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK6\n github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=\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.26 h1:ttDXBBDBAYV4KgP1itGQ5O61F6KwgMMUFHy64bzvuYU=\n-github.com/gruntwork-io/terratest v0.41.26/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.42.0 h1:j3HKRzZ7p4f1iweP2stDSYz+am4+JIbraTehiEWc77s=\n+github.com/gruntwork-io/terratest v0.42.0/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 \n (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.5.2\n-\tgithub.com/gruntwork-io/terratest v0.41.26\n+\tgithub.com/gruntwork-io/terratest v0.42.0\n \tgithub.com/stretchr/testify v1.8.3\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -350,8 +350,8 @@ github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK6\n github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=\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.26 h1:ttDXBBDBAYV4KgP1itGQ5O61F6KwgMMUFHy64bzvuYU=\n-github.com/gruntwork-io/terratest v0.41.26/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.42.0 h1:j3HKRzZ7p4f1iweP2stDSYz+am4+JIbraTehiEWc77s=\n+github.com/gruntwork-io/terratest v0.42.0/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.2\n-\tgithub.com/gruntwork-io/terratest v0.41.26\n+\tgithub.com/gruntwork-io/terratest v0.42.0\n \tgithub.com/stretchr/testify v1.8.3\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -350,8 +350,8 @@ github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK6\n github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=\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.26 h1:ttDXBBDBAYV4KgP1itGQ5O61F6KwgMMUFHy64bzvuYU=\n-github.com/gruntwork-io/terratest v0.41.26/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.42.0 h1:j3HKRzZ7p4f1iweP2stDSYz+am4+JIbraTehiEWc77s=\n+github.com/gruntwork-io/terratest v0.42.0/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 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.2\n-\tgithub.com/gruntwork-io/terratest v0.41.26\n+\tgithub.com/gruntwork-io/terratest v0.42.0\n \tgithub.com/stretchr/testify v1.8.3\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ -350,8 +350,8 @@ github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK6\n github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=\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.26 h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n v0.41.26/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.42.0 h1:j3HKRzZ7p4f1iweP2stDSYz+am4+JIbraTehiEWc77s=\n+github.com/gruntwork-io/terratest v0.42.0/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"
}
] |
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/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.23` -> `v0.41.24` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.24`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.24)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.23...v0.41.24)\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 for Kubernetes PersistentVolumes\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- [@​kaisoz](https://togithub.com/kaisoz)\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/1284](https://togithub.com/gruntwork-io/terratest/pull/1284)\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:eyJjcmVhdGVkSW5WZXIiOiIzNS44OS4xIiwidXBkYXRlZEluVmVyIjoiMzUuODkuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.23\n+\tgithub.com/gruntwork-io/terratest v0.41.24\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.23 h1:GqwK0Nh6IQze3hka6iwuOd1V3wX7/y/85W25d1zpAnE=\n-github.com/gruntwork-io/terratest v0.41.23/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.24 h1:j6T6qe4deVvynTG2UmnjGwZy83he6xKgTaYWiSdFv/w=\n+github.com/gruntwork-io/terratest github.com/googleapis/gax-go/v2 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:\nh1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\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.23\n+\tgithub.com/gruntwork-io/terratest v0.41.24\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.23 h1:GqwK0Nh6IQze3hka6iwuOd1V3wX7/y/85W25d1zpAnE=\n-github.com/gruntwork-io/terratest v0.41.23/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.24 h1:j6T6qe4deVvynTG2UmnjGwZy83he6xKgTaYWiSdFv/w=\n+github.com/gruntwork-io/terratest v0.41.24/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.23\n+\tgithub.com/gruntwork-io/terratest v0.41.24\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.23 h1:GqwK0Nh6IQze3hka6iwuOd1V3wX7/y/85W25d1zpAnE=\n-github.com/gruntwork-io/terratest v0.41.23/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1Yu\n h1:j6T6qe4deVvynTG2UmnjGwZy83he6xKgTaYWiSdFv/w=\n+github.com/gruntwork-io/terratest v0.41.24/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 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.23\n+\tgithub.com/gruntwork-io/terratest v0.41.24\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.23 h1:GqwK0Nh6IQze3hka6iwuOd1V3wX7/y/85W25d1zpAnE=\n-github.com/gruntwork-io/terratest v0.41.23/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.24 h1:j6T6qe4deVvynTG2UmnjGwZy83he6xKgTaYWiSdFv/w=\n+github.com/gruntwork-io/terratest v0.41.24/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"
}
] |
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 | Update | Change |\n|---|---|---|\n| cft/developer-tools | minor | `1.11` -> `1.12` |\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:eyJjcmVhdGVkSW5WZXIiOiIzNS43OS4xIiwidXBkYXRlZEluVmVyIjoiMzUuNzkuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.11\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.12\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.11'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.12'\n---\nbuild/lint.cloudbuild.yaml\n@@ -21,4 +21,4 @@ tags:\n - tags:\n substitutions:\n _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.11'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.12'\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.11\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.12\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.11'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.12'\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.11'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.12'\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.11\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.12\n DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools\n := 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.11'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.12'\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.11'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.12'\n---\n\n\n---\n\nChoice D:\nMakefile\n@@ -171,4 +15,7 @@\n # Make will use bash instead of sh\n SHELL := /usr/bin/env bash\n \n-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.11\n+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.12\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.11'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.12'\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.11'\n+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.12'\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| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.20` -> `v0.41.23` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.23`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.23)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.22...v0.41.23)\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- `helm`\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 Helm chart installation to allow logs redirection\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/1276](https://togithub.com/gruntwork-io/terratest/pull/1276)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.41.22`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.22)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.21...v0.41.22)\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- Fixed k8s.IsDeploymentAvailable() function to check deployment status\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- [@​marcellmartini](https://togithub.com/marcellmartini)\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/1278](https://togithub.com/gruntwork-io/terratest/pull/1278)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_RELATED_LINKS_NEXT -->\n\n### [`v0.41.21`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.21)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.20...v0.41.21)\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 support for port forwarding on Kubernetes deployments\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- [@​marcellmartini](https://togithub.com/marcellmartini)\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/1274](https://togithub.com/gruntwork-io/terratest/pull/1274)\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 - [x] <!-- 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:eyJjcmVhdGVkSW5WZXIiOiIzNS43MS40IiwidXBkYXRlZEluVmVyIjoiMzUuNzQuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.20\n+\tgithub.com/gruntwork-io/terratest v0.41.23\n \tgithub.com/stretchr/testify v1.8.2\n \tgithub.com/tidwall/gjson v1.14.4\n )\n---\ntest/integration/go.sum\n@@ h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=\n +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.20 h1:YIzJy1NXY14cmCAppVxj4b9ATmaYJnzkCptcjMKjpZs=\n-github.com/gruntwork-io/terratest v0.41.20/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.23 h1:GqwK0Nh6IQze3hka6iwuOd1V3wX7/y/85W25d1zpAnE=\n+github.com/gruntwork-io/terratest v0.41.23/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.20\n+\tgithub.com/gruntwork-io/terratest v0.41.23\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 @@ @@ 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.20 h1:YIzJy1NXY14cmCAppVxj4b9ATmaYJnzkCptcjMKjpZs=\n-github.com/gruntwork-io/terratest v0.41.20/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.23 h1:GqwK0Nh6IQze3hka6iwuOd1V3wX7/y/85W25d1zpAnE=\n+github.com/gruntwork-io/terratest v0.41.23/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.20\n+\tgithub.com/gruntwork-io/terratest v0.41.23\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.20 h1:YIzJy1NXY14cmCAppVxj4b9ATmaYJnzkCptcjMKjpZs=\n-github.com/gruntwork-io/terratest v0.41.20/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.23 h1:GqwK0Nh6IQze3hka6iwuOd1V3wX7/y/85W25d1zpAnE=\n+github.com/gruntwork-io/terratest v0.41.23/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 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.20\n+\tgithub.com/gruntwork-io/terratest v0.41.23\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 go 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.20 h1:YIzJy1NXY14cmCAppVxj4b9ATmaYJnzkCptcjMKjpZs=\n-github.com/gruntwork-io/terratest v0.41.20/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.23 h1:GqwK0Nh6IQze3hka6iwuOd1V3wX7/y/85W25d1zpAnE=\n+github.com/gruntwork-io/terratest v0.41.23/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"
}
] |
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 | Pending |\n|---|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://togithub.com/gruntwork-io/terratest) | require | patch | `v0.41.18` -> `v0.41.20` | `v0.41.23` (+2) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.20`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.20)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.19...v0.41.20)\n\n#### Modules affected\n\n- `aws`\n\n#### Description\n\n- Added helper function for getting valid RDS configurations\n- Updated AMI search function to allow retrieval of deprecated AMIs\n\n#### What's Changed\n\n- Test fixes by [@​ellisonc](https://togithub.com/ellisonc) in [https://github.com/gruntwork-io/terratest/pull/1275](https://togithub.com/gruntwork-io/terratest/pull/1275)\n\n**Full Changelog**: https://github.com/gruntwork-io/terratest/compare/v0.41.19...v0.41.20\n\n### [`v0.41.19`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.19)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.18...v0.41.19)\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- Updated S3 bucket creation to pass ObjectOwnership\n- Fixed `terraform-aws-s3-example` to set private ACL\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/1272](https://togithub.com/gruntwork-io/terratest/pull/1272)\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:eyJjcmVhdGVkSW5WZXIiOiIzNS42Ni4zIiwidXBkYXRlZEluVmVyIjoiMzUuNzEuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->\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.41.18\n+\tgithub.com/gruntwork-io/terratest v0.41.20\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.18 h1:xFLF9c6bQ/dpcRera3Bbn1D5RJE+NyRXRndtV/Mjiuc=\n-github.com/gruntwork-io/terratest v0.41.18/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.20 h1:YIzJy1NXY14cmCAppVxj4b9ATmaYJnzkCptcjMKjpZs=\n+github.com/gruntwork-io/terratest v0.41.20/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.18\n+\tgithub.com/gruntwork-io/terratest v0.41.20\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.18 h1:xFLF9c6bQ/dpcRera3Bbn1D5RJE+NyRXRndtV/Mjiuc=\n-github.com/gruntwork-io/terratest v0.41.18/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.20 h1:YIzJy1NXY14cmCAppVxj4b9ATmaYJnzkCptcjMKjpZs=\n+github.com/gruntwork-io/terratest v0.41.20/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n github.com/hashicorp/errwrap h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=\n 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.18\n+\tgithub.com/gruntwork-io/terratest v0.41.20\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.18 h1:xFLF9c6bQ/dpcRera3Bbn1D5RJE+NyRXRndtV/Mjiuc=\n-github.com/gruntwork-io/terratest v0.41.18/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.20 h1:YIzJy1NXY14cmCAppVxj4b9ATmaYJnzkCptcjMKjpZs=\n+github.com/gruntwork-io/terratest v0.41.20/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 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.41.18\n+\tgithub.com/gruntwork-io/terratest v0.41.18\n+\tgithub.com/gruntwork-io/terratest v0.41.20\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.18 h1:xFLF9c6bQ/dpcRera3Bbn1D5RJE+NyRXRndtV/Mjiuc=\n-github.com/gruntwork-io/terratest v0.41.18/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.20 h1:YIzJy1NXY14cmCAppVxj4b9ATmaYJnzkCptcjMKjpZs=\n+github.com/gruntwork-io/terratest v0.41.20/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"
}
] |
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| [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 | `~> 6.0` -> `~> 7.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-network</summary>\n\n### [`v7.0.0`](https://togithub.com/terraform-google-modules/terraform-google-network/blob/HEAD/CHANGELOG.md#​700-httpsgithubcomterraform-google-modulesterraform-google-networkcomparev601v700-2023-04-13)\n\n[Compare Source](https://togithub.com/terraform-google-modules/terraform-google-network/compare/v6.0.1...v7.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TF >= 1.3:** allow optional vars in firewall rules module ([#​438](https://togithub.com/terraform-google-modules/terraform-google-network/issues/438))\n- **TPG >=4.25:** add IPv6 support ([#​420](https://togithub.com/terraform-google-modules/terraform-google-network/issues/420))\n\n##### Features\n\n- **TPG >=4.25:** add IPv6 support ([#​420](https://togithub.com/terraform-google-modules/terraform-google-network/issues/420)) ([4470952](https://togithub.com/terraform-google-modules/terraform-google-network/commit/447095261290c25dae760cabfda5f21d941f0826))\n\n##### Bug Fixes\n\n- **TF >= 1.3:** allow optional vars in firewall rules module ([#​438](https://togithub.com/terraform-google-modules/terraform-google-network/issues/438)) ([b188d37](https://togithub.com/terraform-google-modules/terraform-google-network/commit/b188d37aa20a6975b465dde016656e22321b9432))\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:eyJjcmVhdGVkSW5WZXIiOiIzNS40OS4wIiwidXBkYXRlZEluVmVyIjoiMzUuNDkuMCJ9-->\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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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@@ -40,7 +40,7 @@ module \"test-vpc-module\" {\n \n module \"serverless-connector\" {\n source = \"terraform-google-modules/network/google//modules/vpc-serverless-connector-beta\"\n- version = \"~> 6.0\"\n+ version = \"~> 7.0\"\n project_id = var.project_id\n vpc_connectors = [{\n name = \"central-serverless\"\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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.0\"\n project_id = var.project_id # Replace this with your project ID 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 = \"~> 6.0\"\n+ version = \"~> 7.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@@ -40,7 +40,7 @@ module \"test-vpc-module\" {\n \n module \"serverless-connector\" {\n source = \"terraform-google-modules/network/google//modules/vpc-serverless-connector-beta\"\n- version = \"~> 6.0\"\n+ version = \"~> 7.0\"\n project_id = var.project_id\n vpc_connectors = [{\n name = \"central-serverless\"\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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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@@ -40,7 +40,7 @@ module \"test-vpc-module\" {\n \n module \"serverless-connector\" {\n source = \"terraform-google-modules/network/google//modules/vpc-serverless-connector-beta\"\n- version = \"~> 6.0\"\n+ version = \"~> 7.0\"\n project_id = var.project_id\n vpc_connectors = [{\n name = \"central-serverless\"\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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.0\"\n local_network = var.local_network # Replace with self link vpc_static_route_create]\n 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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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 = \"~> 6.0\"\n+ version = \"~> 7.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@@ -40,7 +40,7 @@ module \"test-vpc-module\" {\n \n module \"serverless-connector\" {\n source = \"terraform-google-modules/network/google//modules/vpc-serverless-connector-beta\"\n- version = \"~> 6.0\"\n+ version = \"~> 7.0\"\n project_id = var.project_id\n vpc_connectors = [{\n name = \"central-serverless\"\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.17` -> `v0.41.18` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest</summary>\n\n### [`v0.41.18`](https://togithub.com/gruntwork-io/terratest/releases/tag/v0.41.18)\n\n[Compare Source](https://togithub.com/gruntwork-io/terratest/compare/v0.41.17...v0.41.18)\n\n#### What's Changed\n\n- Feat: Add ability to get a random region for a specific service by [@​MoonMoon1919](https://togithub.com/MoonMoon1919) in [https://github.com/gruntwork-io/terratest/pull/1269](https://togithub.com/gruntwork-io/terratest/pull/1269)\n\n#### New Contributors\n\n- [@​MoonMoon1919](https://togithub.com/MoonMoon1919) made their first contribution in [https://github.com/gruntwork-io/terratest/pull/1269](https://togithub.com/gruntwork-io/terratest/pull/1269)\n\n**Full Changelog**: https://github.com/gruntwork-io/terratest/compare/v0.41.17...v0.41.18\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:eyJjcmVhdGVkSW5WZXIiOiIzNS40OS4wIiwidXBkYXRlZEluVmVyIjoiMzUuNDkuMCJ9-->\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.17\n+\tgithub.com/gruntwork-io/terratest v0.41.18\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.17 h1:gzI8N+w2Bpxm27cmUygm6fJBo7CPrPwq/fy2BDgxy8I=\n-github.com/gruntwork-io/terratest v0.41.17/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.18 h1:xFLF9c6bQ/dpcRera3Bbn1D5RJE+NyRXRndtV/Mjiuc=\n+github.com/gruntwork-io/terratest v0.41.18/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n github.com/hashicorp/errwrap \tgithub.com/tidwall/gjson 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.17\n+\tgithub.com/gruntwork-io/terratest v0.41.18\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.17 h1:gzI8N+w2Bpxm27cmUygm6fJBo7CPrPwq/fy2BDgxy8I=\n-github.com/gruntwork-io/terratest v0.41.17/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.18 h1:xFLF9c6bQ/dpcRera3Bbn1D5RJE+NyRXRndtV/Mjiuc=\n+github.com/gruntwork-io/terratest v0.41.18/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 @@ @@ 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.17\n+\tgithub.com/gruntwork-io/terratest v0.41.18\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.17 h1:gzI8N+w2Bpxm27cmUygm6fJBo7CPrPwq/fy2BDgxy8I=\n-github.com/gruntwork-io/terratest v0.41.17/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.18 h1:xFLF9c6bQ/dpcRera3Bbn1D5RJE+NyRXRndtV/Mjiuc=\n+github.com/gruntwork-io/terratest v0.41.18/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 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 \tgithub.com/tidwall/gjson v0.41.18\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.17 h1:gzI8N+w2Bpxm27cmUygm6fJBo7CPrPwq/fy2BDgxy8I=\n-github.com/gruntwork-io/terratest v0.41.17/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk=\n+github.com/gruntwork-io/terratest v0.41.18 h1:xFLF9c6bQ/dpcRera3Bbn1D5RJE+NyRXRndtV/Mjiuc=\n+github.com/gruntwork-io/terratest v0.41.18/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:\nMany of the vars in the firewall rules module are optional.\r\n\r\nNotably, log_config should be optional. Instead, the module requires that you set a value and enable logging to use the resource.\r\n\r\nhttps://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_firewall\n\n---\n\nChoice A:\nmodules/firewall-rules/README.md\n@@ -41,7 +41,7 @@ module \"firewall_rules\" {\n |------|-------------|------|---------|:--------:|\n | network\\_name | 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-| 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). | <pre>list(object({<br> name = string<br> description = optional(string)<br> direction = optional(string)<br> priority = optional(number)<br> ranges = optional(list(string))<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })))<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })))<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n \n ## Outputs\n \n---\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---\nmodules/firewall-rules/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3.0\"\n \n required_providers {\n google = {\n---\n\n\n---\n\nChoice B:\nmodules/firewall-rules/README.md\n@@ -41,7 +41,7 @@ module \"firewall_rules\" {\n |------|-------------|------|---------|:--------:|\n | network\\_name | 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-| 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). | <pre>list(object({<br> name = string<br> description = optional(string)<br> direction = optional(string)<br> priority = optional(number)<br> ranges = optional(list(string))<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })))<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })))<br> log_config = optional(object({<br> metadata string<br> }))<br> }))</pre> | `[]` | no |\n \n ## Outputs\n \n---\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---\nmodules/firewall-rules/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3.0\"\n \n required_providers {\n google = {\n---\n\n\n---\n\nChoice C:\nmodules/firewall-rules/README.md\n@@ -41,7 +41,7 @@ module \"firewall_rules\" {\n |------|-------------|------|---------|:--------:|\n | network\\_name | 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-| 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). | <pre>list(object({<br> name = string<br> description = optional(string)<br> direction = optional(string)<br> priority = optional(number)<br> ranges = optional(list(string))<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })))<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })))<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n \n ## Outputs\n \n---\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---\nmodules/firewall-rules/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3.0\"\n \n required_providers {\n google = {\n---\n\n\n---\n\nChoice D:\nmodules/firewall-rules/README.md\n@@ -41,7 +41,7 @@ module \"firewall_rules\" {\n |------|-------------|------|---------|:--------:|\n | network\\_name | 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-| 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). | <pre>list(object({<br> name = string<br> description = optional(string)<br> direction = optional(string)<br> priority = optional(number)<br> ranges = optional(list(string))<br> source_tags = optional(list(string))<br> source_service_accounts = optional(list(string))<br> target_tags = optional(list(string))<br> target_service_accounts = optional(list(string))<br> allow = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })))<br> deny = optional(list(object({<br> protocol = string<br> ports = optional(list(string))<br> })))<br> log_config = optional(object({<br> metadata = string<br> }))<br> }))</pre> | `[]` | no |\n \n ## Outputs\n \n---\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---\nmodules/firewall-rules/versions.tf\n@@ -15,7 +15,7 @@\n */\n \n terraform {\n- required_version = \">= 0.13.0\"\n+ required_version = \">= 1.3.0\"\n \n required_providers {\n google = {\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## [7.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.1...v7.0.0) (2023-04-13)\n\n\n### ⚠ BREAKING CHANGES\n\n* **TF >= 1.3:** allow optional vars in firewall rules module ([#438](https://github.com/terraform-google-modules/terraform-google-network/issues/438))\n* **TPG >=4.25:** add IPv6 support ([#420](https://github.com/terraform-google-modules/terraform-google-network/issues/420))\n\n### Features\n\n* **TPG >=4.25:** add IPv6 support ([#420](https://github.com/terraform-google-modules/terraform-google-network/issues/420)) ([4470952](https://github.com/terraform-google-modules/terraform-google-network/commit/447095261290c25dae760cabfda5f21d941f0826))\n\n\n### Bug Fixes\n\n* **TF >= 1.3:** allow optional vars in firewall rules module ([#438](https://github.com/terraform-google-modules/terraform-google-network/issues/438)) ([b188d37](https://github.com/terraform-google-modules/terraform-google-network/commit/b188d37aa20a6975b465dde016656e22321b9432))\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,23 @@\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+## [7.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.1...v7.0.0) (2023-04-13)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* **TF >= 1.3:** allow optional vars in firewall rules module ([#438](https://github.com/terraform-google-modules/terraform-google-network/issues/438))\n+* **TPG >=4.25:** add IPv6 support ([#420](https://github.com/terraform-google-modules/terraform-google-network/issues/420))\n+\n+### Features\n+\n+* **TPG >=4.25:** add IPv6 support ([#420](https://github.com/terraform-google-modules/terraform-google-network/issues/420)) ([4470952](https://github.com/terraform-google-modules/terraform-google-network/commit/447095261290c25dae760cabfda5f21d941f0826))\n+\n+\n+### Bug Fixes\n+\n+* **TF >= 1.3:** allow optional vars in firewall rules module ([#438](https://github.com/terraform-google-modules/terraform-google-network/issues/438)) ([b188d37](https://github.com/terraform-google-modules/terraform-google-network/commit/b188d37aa20a6975b465dde016656e22321b9432))\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---\nREADME.md\n@@ -12,8 +12,8 @@ Sub modules are provided for creating individual vpc, subnets, and routes. See t\n \n ## Compatibility\n \n-This module is meant for use with Terraform 0.13+ and tested using Terraform 1.0+.\n-If you find incompatibilities using Terraform `>=0.13`, please open an issue.\n+This module is meant for use with Terraform 1.3+ and tested using Terraform 1.4+.\n+If you find incompatibilities using Terraform `>=1.3`, please open an issue.\n \n If you haven't [upgraded][terraform-0.13-upgrade] and need a Terraform\n 0.12.x-compatible version of this module, the last released version\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 = \"~> 6.0\"\n+ version = \"~> 7.0\"\n \n project_id = \"<PROJECT ID>\"\n network_name = \"example-vpc\"\n@@ -165,10 +165,9 @@ The routes list contains maps, where each object represents a route. For the nex\n \n ## Requirements\n ### Installed Software\n-- [Terraform](https://www.terraform.io/downloads.html) ~> 0.12.6\n-- [Terraform Provider for GCP](https://github.com/terraform-providers/terraform-provider-google) ~> 2.19\n-- [Terraform Provider for GCP Beta](https://github.com/terraform-providers/terraform-provider-google-beta) ~>\n- 2.19\n+- [Terraform](https://www.terraform.io/downloads.html) >= 1.3\n+- [Terraform Provider for GCP](https://github.com/terraform-providers/terraform-provider-google) >= 4.25\n+- [Terraform Provider for GCP Beta](https://github.com/terraform-providers/terraform-provider-google-beta) >= 4.25\n - [gcloud](https://cloud.google.com/sdk/gcloud/) >243.0.0\n \n ### Configure a Service Account\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.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.0.0\"\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.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.0.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.0.0\"\n }\n }\n---\n\n\n---\n\nChoice B:\nCHANGELOG.md\n@@ -2,6 +2,23 @@\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+## [7.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.1...v7.0.0) (2023-04-13)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* **TF >= 1.3:** allow optional vars in firewall rules module ([#438](https://github.com/terraform-google-modules/terraform-google-network/issues/438))\n+* **TPG >=4.25:** add IPv6 support ([#420](https://github.com/terraform-google-modules/terraform-google-network/issues/420))\n+\n+### Features\n+\n+* **TPG >=4.25:** add IPv6 support ([#420](https://github.com/terraform-google-modules/terraform-google-network/issues/420)) ([4470952](https://github.com/terraform-google-modules/terraform-google-network/commit/447095261290c25dae760cabfda5f21d941f0826))\n+\n+\n+### Bug Fixes\n+\n+* **TF >= 1.3:** allow optional vars in firewall rules module ([#438](https://github.com/terraform-google-modules/terraform-google-network/issues/438)) ([b188d37](https://github.com/terraform-google-modules/terraform-google-network/commit/b188d37aa20a6975b465dde016656e22321b9432))\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---\nREADME.md\n@@ -12,8 +12,8 @@ Sub modules are provided for creating individual vpc, subnets, and routes. See t\n \n ## Compatibility\n \n-This module is meant for use with Terraform 0.13+ and tested using Terraform 1.0+.\n-If you find incompatibilities using Terraform `>=0.13`, please open an issue.\n+This module is meant for use with Terraform 1.3+ and tested using Terraform 1.4+.\n+If you find incompatibilities using Terraform `>=1.3`, please open an issue.\n \n If you haven't [upgraded][terraform-0.13-upgrade] and need a Terraform\n 0.12.x-compatible version of this module, the last released version\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 = \"~> 6.0\"\n+ version = \"~> 7.0\"\n \n project_id = \"<PROJECT ID>\"\n network_name = \"example-vpc\"\n@@ -165,10 +165,9 @@ The routes list contains maps, where each object represents a route. For the nex\n \n ## Requirements\n ### Installed Software\n-- [Terraform](https://www.terraform.io/downloads.html) ~> 0.12.6\n-- [Terraform Provider for GCP](https://github.com/terraform-providers/terraform-provider-google) ~> 2.19\n-- [Terraform Provider for GCP Beta](https://github.com/terraform-providers/terraform-provider-google-beta) ~>\n- 2.19\n+- [Terraform](https://www.terraform.io/downloads.html) >= 1.3\n+- [Terraform Provider for GCP](https://github.com/terraform-providers/terraform-provider-google) >= 4.25\n+- [Terraform Provider for GCP Beta](https://github.com/terraform-providers/terraform-provider-google-beta) >= 4.25\n - [gcloud](https://cloud.google.com/sdk/gcloud/) >243.0.0\n \n ### Configure a Service Account\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.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.0.0\"\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.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.0.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.0.0\"\n }\n }\n---\n\n\n---\n\nChoice C:\nCHANGELOG.md\n@@ -2,6 +2,23 @@\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+## [7.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.1...v7.0.0) (2023-04-13)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* **TF >= 1.3:** allow optional vars in firewall rules module ([#438](https://github.com/terraform-google-modules/terraform-google-network/issues/438))\n+* **TPG >=4.25:** add IPv6 support ([#420](https://github.com/terraform-google-modules/terraform-google-network/issues/420))\n+\n+### Features\n+\n+* **TPG >=4.25:** add IPv6 support ([#420](https://github.com/terraform-google-modules/terraform-google-network/issues/420)) ([4470952](https://github.com/terraform-google-modules/terraform-google-network/commit/447095261290c25dae760cabfda5f21d941f0826))\n+\n+\n+### Bug Fixes\n+\n+* **TF >= 1.3:** allow optional vars in firewall rules module ([#438](https://github.com/terraform-google-modules/terraform-google-network/issues/438)) ([b188d37](https://github.com/terraform-google-modules/terraform-google-network/commit/b188d37aa20a6975b465dde016656e22321b9432))\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---\nREADME.md\n@@ -12,8 +12,8 @@ Sub modules are provided for creating individual vpc, subnets, and routes. See t\n \n ## Compatibility\n \n-This module is meant for use with Terraform 0.13+ and tested using Terraform 1.0+.\n-If you find incompatibilities using Terraform `>=0.13`, please open an issue.\n+This module is meant for use with Terraform 1.3+ and tested using Terraform 1.4+.\n+If you find incompatibilities using Terraform `>=1.3`, please open an issue.\n \n If you haven't [upgraded][terraform-0.13-upgrade] and need a Terraform\n 0.12.x-compatible version of this module, the last released version\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 = \"~> 6.0\"\n+ version = \"~> 7.0\"\n \n project_id = \"<PROJECT ID>\"\n network_name = \"example-vpc\"\n@@ -165,10 +165,9 @@ The routes list contains maps, where each object represents a route. For the nex\n \n ## Requirements\n ### Installed Software\n-- [Terraform](https://www.terraform.io/downloads.html) ~> 0.12.6\n-- [Terraform Provider for GCP](https://github.com/terraform-providers/terraform-provider-google) ~> 2.19\n-- [Terraform Provider for GCP Beta](https://github.com/terraform-providers/terraform-provider-google-beta) ~>\n- 2.19\n+- [Terraform](https://www.terraform.io/downloads.html) >= 1.3\n+- [Terraform Provider for GCP](https://github.com/terraform-providers/terraform-provider-google) >= 4.25\n+- [Terraform Provider for GCP Beta](https://github.com/terraform-providers/terraform-provider-google-beta) >= 4.25\n - [gcloud](https://cloud.google.com/sdk/gcloud/) >243.0.0\n \n ### Configure a Service Account\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.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.0.0\"\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.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.0.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.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/v6.0.1\"\n+ }\n---\nmodules/private-service-connect/versions.tf\n@@ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.0.0\"\n }\n }\n---\n\n\n---\n\nChoice D:\nCHANGELOG.md\n@@ -2,6 +2,23 @@\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+## [7.0.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v6.0.1...v7.0.0) (2023-04-13)\n+\n+\n+### ⚠ BREAKING CHANGES\n+\n+* **TF >= 1.3:** allow optional vars in firewall rules module ([#438](https://github.com/terraform-google-modules/terraform-google-network/issues/438))\n+* **TPG >=4.25:** add IPv6 support ([#420](https://github.com/terraform-google-modules/terraform-google-network/issues/420))\n+\n+### Features\n+\n+* **TPG >=4.25:** add IPv6 support ([#420](https://github.com/terraform-google-modules/terraform-google-network/issues/420)) ([4470952](https://github.com/terraform-google-modules/terraform-google-network/commit/447095261290c25dae760cabfda5f21d941f0826))\n+\n+\n+### Bug Fixes\n+\n+* **TF >= 1.3:** allow optional vars in firewall rules module ([#438](https://github.com/terraform-google-modules/terraform-google-network/issues/438)) ([b188d37](https://github.com/terraform-google-modules/terraform-google-network/commit/b188d37aa20a6975b465dde016656e22321b9432))\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---\nREADME.md\n@@ -12,8 +12,8 @@ Sub modules are provided for creating individual vpc, subnets, and routes. See t\n \n ## Compatibility\n \n-This module is meant for use with Terraform 0.13+ and tested using Terraform 1.0+.\n-If you find incompatibilities using Terraform `>=0.13`, please open an issue.\n+This module is meant for use with Terraform 1.3+ and tested using Terraform 1.4+.\n+If you find incompatibilities using Terraform `>=1.3`, please open an issue.\n \n If you haven't [upgraded][terraform-0.13-upgrade] and need a Terraform\n 0.12.x-compatible }\n of this module, the last released version\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 = \"~> 6.0\"\n+ version = \"~> 7.0\"\n \n project_id = \"<PROJECT ID>\"\n network_name = \"example-vpc\"\n@@ -165,10 +165,9 @@ The routes list contains maps, where each object represents a route. For the nex\n \n ## Requirements\n ### Installed Software\n-- [Terraform](https://www.terraform.io/downloads.html) ~> 0.12.6\n-- [Terraform Provider for GCP](https://github.com/terraform-providers/terraform-provider-google) ~> 2.19\n-- [Terraform Provider for GCP Beta](https://github.com/terraform-providers/terraform-provider-google-beta) ~>\n- 2.19\n+- [Terraform](https://www.terraform.io/downloads.html) >= 1.3\n+- [Terraform Provider for GCP](https://github.com/terraform-providers/terraform-provider-google) >= 4.25\n+- [Terraform Provider for GCP Beta](https://github.com/terraform-providers/terraform-provider-google-beta) >= 4.25\n - [gcloud](https://cloud.google.com/sdk/gcloud/) >243.0.0\n \n ### Configure a Service Account\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.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:firewall-rules/v7.0.0\"\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.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:network-peering/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.0.0\"\n }\n \n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:private-service-connect/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes-beta/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:routes/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets-beta/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:subnets/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.0.0\"\n }\n provider_meta \"google-beta\" {\n- module_name = \"blueprints/terraform/terraform-google-network:vpc/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network:vpc/v7.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/v6.0.1\"\n+ module_name = \"blueprints/terraform/terraform-google-network/v7.0.0\"\n }\n }\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.