From 640ea272d3e51bcfb15617d4465ef8040d1d1596 Mon Sep 17 00:00:00 2001 From: Nathan Mckinley Date: Wed, 20 Oct 2021 21:10:40 -0700 Subject: [PATCH 1/4] Move Cloud Build Worker Pool to GA. Note: this includes some unusual changes due to deviations between the beta and GA APIs. --- ...esource_cloudbuild_worker_pool_test.go.erb | 2 - .../third_party/terraform/utils/config.go.erb | 1 - .../terraform/utils/provider.go.erb | 6 - .../cloudbuild/tpgtools_product.yaml | 6 + .../overrides/cloudbuild/worker_pool.yaml | 4 + tpgtools/serialization.go | 120 ++++++++++++++++++ 6 files changed, 130 insertions(+), 9 deletions(-) create mode 100644 tpgtools/overrides/cloudbuild/tpgtools_product.yaml create mode 100644 tpgtools/overrides/cloudbuild/worker_pool.yaml diff --git a/mmv1/third_party/terraform/tests/resource_cloudbuild_worker_pool_test.go.erb b/mmv1/third_party/terraform/tests/resource_cloudbuild_worker_pool_test.go.erb index 100a723a98eb..b5b2f4aa0a8e 100644 --- a/mmv1/third_party/terraform/tests/resource_cloudbuild_worker_pool_test.go.erb +++ b/mmv1/third_party/terraform/tests/resource_cloudbuild_worker_pool_test.go.erb @@ -1,7 +1,6 @@ <% autogen_exception -%> package google -<% unless version == 'ga' -%> import ( "fmt" "strings" @@ -190,4 +189,3 @@ func funcAccTestCloudbuildWorkerPoolCheckDestroy(t *testing.T) func(s *terraform return nil } } -<% end -%> diff --git a/mmv1/third_party/terraform/utils/config.go.erb b/mmv1/third_party/terraform/utils/config.go.erb index c837874a8040..3cddf6895a87 100644 --- a/mmv1/third_party/terraform/utils/config.go.erb +++ b/mmv1/third_party/terraform/utils/config.go.erb @@ -134,7 +134,6 @@ type Config struct { <% unless version == 'ga' -%> // CloudBuild WorkerPool uses a different endpoint (v1beta1) than any other CloudBuild resources CloudBuildWorkerPoolBasePath string - <% end -%> } <% products.each do |product| -%> diff --git a/mmv1/third_party/terraform/utils/provider.go.erb b/mmv1/third_party/terraform/utils/provider.go.erb index a012c93c9bcc..87bfc8a53cef 100644 --- a/mmv1/third_party/terraform/utils/provider.go.erb +++ b/mmv1/third_party/terraform/utils/provider.go.erb @@ -189,9 +189,7 @@ func Provider() *schema.Provider { VmwareEndpointEntryKey: VmwareEndpointEntry, <% end -%> - <% unless version == "ga" -%> CloudBuildWorkerPoolEndpointEntryKey: CloudBuildWorkerPoolEndpointEntry, - <% end -%> }, ProviderMetaSchema: map[string]*schema.Schema{ @@ -456,9 +454,7 @@ end # products.each do // resources implemented within tpgtools map[string]*schema.Resource{ "google_assured_workloads_workload": resourceAssuredWorkloadsWorkload(), - <% unless version == 'ga' -%> "google_cloudbuild_worker_pool": resourceCloudbuildWorkerPool(), - <% end -%> "google_compute_firewall_policy_association": resourceComputeFirewallPolicyAssociation(), "google_compute_firewall_policy": resourceComputeFirewallPolicy(), "google_compute_firewall_policy_rule": resourceComputeFirewallPolicyRule(), @@ -655,9 +651,7 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr config.GkeHubBasePath = d.Get(GkeHubFeatureCustomEndpointEntryKey).(string) config.OrgPolicyBasePath = d.Get(OrgPolicyEndpointEntryKey).(string) config.PrivatecaBasePath = d.Get(PrivatecaCertificateTemplateEndpointEntryKey).(string) - <% unless version == "ga" -%> config.CloudBuildWorkerPoolBasePath = d.Get(CloudBuildWorkerPoolEndpointEntryKey).(string) - <% end -%> stopCtx, ok := schema.StopContext(ctx) if !ok { diff --git a/tpgtools/overrides/cloudbuild/tpgtools_product.yaml b/tpgtools/overrides/cloudbuild/tpgtools_product.yaml new file mode 100644 index 000000000000..c14db0746cb2 --- /dev/null +++ b/tpgtools/overrides/cloudbuild/tpgtools_product.yaml @@ -0,0 +1,6 @@ +- type: PRODUCT_BASE_PATH + details: + basepathidentifier: cloud_build_worker_pool +- type: PRODUCT_TITLE # used to align with mmv1 product + details: + title: "cloudbuild" diff --git a/tpgtools/overrides/cloudbuild/worker_pool.yaml b/tpgtools/overrides/cloudbuild/worker_pool.yaml new file mode 100644 index 000000000000..cd0c1f24a8fe --- /dev/null +++ b/tpgtools/overrides/cloudbuild/worker_pool.yaml @@ -0,0 +1,4 @@ +- type: DIFF_SUPPRESS_FUNC + field: network_config.peered_network + details: + diffsuppressfunc: compareResourceNames \ No newline at end of file diff --git a/tpgtools/serialization.go b/tpgtools/serialization.go index 1d18850c54fd..e6635d5cf7a0 100644 --- a/tpgtools/serialization.go +++ b/tpgtools/serialization.go @@ -23,6 +23,7 @@ import ( assuredworkloads "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/assuredworkloads" assuredworkloadsBeta "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/assuredworkloads/beta" + cloudbuild "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/cloudbuild" cloudbuildBeta "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/cloudbuild/beta" cloudresourcemanager "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/cloudresourcemanager" cloudresourcemanagerBeta "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/cloudresourcemanager/beta" @@ -88,6 +89,8 @@ func DCLToTerraformReference(resourceType, version string) (string, error) { switch resourceType { case "AssuredWorkloadsWorkload": return "google_assured_workloads_workload", nil + case "CloudbuildWorkerPool": + return "google_cloudbuild_worker_pool", nil case "CloudResourceManagerFolder": return "google_folder", nil case "CloudResourceManagerProject": @@ -123,6 +126,8 @@ func DCLToTerraformSampleName(service, resource string) (string, string, error) switch service + resource { case "assuredworkloadsworkload": return "AssuredWorkloads", "Workload", nil + case "cloudbuildworkerpool": + return "cloudbuild", "WorkerPool", nil case "cloudresourcemanagerfolder": return "CloudResourceManager", "Folder", nil case "cloudresourcemanagerproject": @@ -263,6 +268,12 @@ func ConvertSampleJSONToHCL(resourceType string, version string, hasGAEquivalent return "", err } return AssuredWorkloadsWorkloadAsHCL(*r, hasGAEquivalent) + case "CloudbuildWorkerPool": + r := &cloudbuild.WorkerPool{} + if err := json.Unmarshal(b, r); err != nil { + return "", err + } + return CloudbuildWorkerPoolAsHCL(*r, hasGAEquivalent) case "CloudResourceManagerFolder": r := &cloudresourcemanager.Folder{} if err := json.Unmarshal(b, r); err != nil { @@ -2708,6 +2719,71 @@ func convertAssuredWorkloadsWorkloadResourcesToHCL(r *assuredworkloads.WorkloadR return outputConfig + "}" } +// CloudbuildWorkerPoolAsHCL returns a string representation of the specified resource in HCL. +// The generated HCL will include every settable field as a literal - that is, no +// variables, no references. This may not be the best possible representation, but +// the crucial point is that `terraform import; terraform apply` will not produce +// any changes. We do not validate that the resource specified will pass terraform +// validation unless is an object returned from the API after an Apply. +func CloudbuildWorkerPoolAsHCL(r cloudbuild.WorkerPool, hasGAEquivalent bool) (string, error) { + outputConfig := "resource \"google_cloudbuild_worker_pool\" \"output\" {\n" + if r.Location != nil { + outputConfig += fmt.Sprintf("\tlocation = %#v\n", *r.Location) + } + if r.Name != nil { + outputConfig += fmt.Sprintf("\tname = %#v\n", *r.Name) + } + if r.DisplayName != nil { + outputConfig += fmt.Sprintf("\tdisplay_name = %#v\n", *r.DisplayName) + } + if v := convertCloudbuildWorkerPoolNetworkConfigToHCL(r.NetworkConfig); v != "" { + outputConfig += fmt.Sprintf("\tnetwork_config %s\n", v) + } + if r.Project != nil { + outputConfig += fmt.Sprintf("\tproject = %#v\n", *r.Project) + } + if v := convertCloudbuildWorkerPoolWorkerConfigToHCL(r.WorkerConfig); v != "" { + outputConfig += fmt.Sprintf("\tworker_config %s\n", v) + } + formatted, err := formatHCL(outputConfig + "}") + if err != nil { + return "", err + } + if !hasGAEquivalent { + // The formatter will not accept the google-beta symbol because it is injected during testing. + return withProviderLine(formatted), nil + } + return formatted, nil +} + +func convertCloudbuildWorkerPoolNetworkConfigToHCL(r *cloudbuild.WorkerPoolNetworkConfig) string { + if r == nil { + return "" + } + outputConfig := "{\n" + if r.PeeredNetwork != nil { + outputConfig += fmt.Sprintf("\tpeered_network = %#v\n", *r.PeeredNetwork) + } + return outputConfig + "}" +} + +func convertCloudbuildWorkerPoolWorkerConfigToHCL(r *cloudbuild.WorkerPoolWorkerConfig) string { + if r == nil { + return "" + } + outputConfig := "{\n" + if r.DiskSizeGb != nil { + outputConfig += fmt.Sprintf("\tdisk_size_gb = %#v\n", *r.DiskSizeGb) + } + if r.MachineType != nil { + outputConfig += fmt.Sprintf("\tmachine_type = %#v\n", *r.MachineType) + } + if r.NoExternalIP != nil { + outputConfig += fmt.Sprintf("\tno_external_ip = %#v\n", *r.NoExternalIP) + } + return outputConfig + "}" +} + // CloudResourceManagerFolderAsHCL returns a string representation of the specified resource in HCL. // The generated HCL will include every settable field as a literal - that is, no // variables, no references. This may not be the best possible representation, but @@ -6692,6 +6768,50 @@ func convertAssuredWorkloadsWorkloadResourcesList(i interface{}) (out []map[stri return out } +func convertCloudbuildWorkerPoolNetworkConfig(i interface{}) map[string]interface{} { + if i == nil { + return nil + } + in := i.(map[string]interface{}) + return map[string]interface{}{ + "peeredNetwork": in["peered_network"], + } +} + +func convertCloudbuildWorkerPoolNetworkConfigList(i interface{}) (out []map[string]interface{}) { + if i == nil { + return nil + } + + for _, v := range i.([]interface{}) { + out = append(out, convertCloudbuildWorkerPoolNetworkConfig(v)) + } + return out +} + +func convertCloudbuildWorkerPoolWorkerConfig(i interface{}) map[string]interface{} { + if i == nil { + return nil + } + in := i.(map[string]interface{}) + return map[string]interface{}{ + "diskSizeGb": in["disk_size_gb"], + "machineType": in["machine_type"], + "noExternalIP": in["no_external_ip"], + } +} + +func convertCloudbuildWorkerPoolWorkerConfigList(i interface{}) (out []map[string]interface{}) { + if i == nil { + return nil + } + + for _, v := range i.([]interface{}) { + out = append(out, convertCloudbuildWorkerPoolWorkerConfig(v)) + } + return out +} + func convertComputeFirewallPolicyRuleMatch(i interface{}) map[string]interface{} { if i == nil { return nil From 7ebe53f49fb3c01ba4c41326a25f40d1b26b5b08 Mon Sep 17 00:00:00 2001 From: Nathan Mckinley Date: Tue, 9 Nov 2021 15:47:04 -0800 Subject: [PATCH 2/4] upgrade dcl. --- mmv1/third_party/terraform/go.mod.erb | 2 +- mmv1/third_party/terraform/go.sum | 2 ++ tpgtools/go.mod | 2 +- tpgtools/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mmv1/third_party/terraform/go.mod.erb b/mmv1/third_party/terraform/go.mod.erb index 7a2b9520402a..0c72bf9a2e96 100644 --- a/mmv1/third_party/terraform/go.mod.erb +++ b/mmv1/third_party/terraform/go.mod.erb @@ -3,7 +3,7 @@ module github.com/hashicorp/terraform-provider-google<%= "-" + version unless ve require ( cloud.google.com/go/bigtable v1.10.1 - github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211021165233-f4f2a757f9e0 + github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211109205522-6cd3cdca0637 github.com/apparentlymart/go-cidr v1.1.0 github.com/client9/misspell v0.3.4 github.com/davecgh/go-spew v1.1.1 diff --git a/mmv1/third_party/terraform/go.sum b/mmv1/third_party/terraform/go.sum index 0c1b5d09bb48..08015a6135c7 100644 --- a/mmv1/third_party/terraform/go.sum +++ b/mmv1/third_party/terraform/go.sum @@ -1430,3 +1430,5 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211109205522-6cd3cdca0637 h1:sFNz5neMQaa4CIRE2D35t5A84lps/ylOlAXE+ByRKho= +github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211109205522-6cd3cdca0637/go.mod h1:oEeBHikdF/NrnUy0ornVaY1OT+jGvTqm+LQS0+ZDKzU= diff --git a/tpgtools/go.mod b/tpgtools/go.mod index 51f03a5742c5..64f092941fb1 100644 --- a/tpgtools/go.mod +++ b/tpgtools/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( bitbucket.org/creachadair/stringset v0.0.9 - github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211021165233-f4f2a757f9e0 + github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211109205522-6cd3cdca0637 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/hashicorp/errwrap v1.0.0 github.com/hashicorp/hcl v1.0.0 diff --git a/tpgtools/go.sum b/tpgtools/go.sum index efb0700dbdcb..24af299bdb41 100644 --- a/tpgtools/go.sum +++ b/tpgtools/go.sum @@ -36,8 +36,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211021165233-f4f2a757f9e0 h1:GQS66Qx0pa9JHrjKyI5AHesSPeFNlHebXlASOXzCJKY= -github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211021165233-f4f2a757f9e0/go.mod h1:oEeBHikdF/NrnUy0ornVaY1OT+jGvTqm+LQS0+ZDKzU= +github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211109205522-6cd3cdca0637 h1:sFNz5neMQaa4CIRE2D35t5A84lps/ylOlAXE+ByRKho= +github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211109205522-6cd3cdca0637/go.mod h1:oEeBHikdF/NrnUy0ornVaY1OT+jGvTqm+LQS0+ZDKzU= github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE= github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= From 38d41b65b74dc699dff1115cb7677ea48f1fed74 Mon Sep 17 00:00:00 2001 From: Nathan Mckinley Date: Tue, 9 Nov 2021 17:12:35 -0800 Subject: [PATCH 3/4] finish removing version gate. --- mmv1/third_party/terraform/utils/config.go.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/mmv1/third_party/terraform/utils/config.go.erb b/mmv1/third_party/terraform/utils/config.go.erb index 3cddf6895a87..b6452ece7225 100644 --- a/mmv1/third_party/terraform/utils/config.go.erb +++ b/mmv1/third_party/terraform/utils/config.go.erb @@ -131,7 +131,6 @@ type Config struct { <% if version == 'private' -%> VmwareBasePath string <% end -%> - <% unless version == 'ga' -%> // CloudBuild WorkerPool uses a different endpoint (v1beta1) than any other CloudBuild resources CloudBuildWorkerPoolBasePath string } From 48aea6e1d9e812e59af12d515f1b70906a75f8e9 Mon Sep 17 00:00:00 2001 From: Nathan Mckinley Date: Thu, 18 Nov 2021 17:48:57 -0800 Subject: [PATCH 4/4] Use new GA / Beta versions, neither of which is ACL'd. --- mmv1/third_party/terraform/go.mod.erb | 2 +- mmv1/third_party/terraform/go.sum | 2 ++ tpgtools/go.mod | 2 +- tpgtools/go.sum | 4 ++-- tpgtools/overrides/cloudbuild/beta/worker_pool.yaml | 4 +++- tpgtools/overrides/cloudbuild/worker_pool.yaml | 4 +++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mmv1/third_party/terraform/go.mod.erb b/mmv1/third_party/terraform/go.mod.erb index 0c72bf9a2e96..ffdd7ef3d146 100644 --- a/mmv1/third_party/terraform/go.mod.erb +++ b/mmv1/third_party/terraform/go.mod.erb @@ -3,7 +3,7 @@ module github.com/hashicorp/terraform-provider-google<%= "-" + version unless ve require ( cloud.google.com/go/bigtable v1.10.1 - github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211109205522-6cd3cdca0637 + github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211117235310-d31aef517fa2 github.com/apparentlymart/go-cidr v1.1.0 github.com/client9/misspell v0.3.4 github.com/davecgh/go-spew v1.1.1 diff --git a/mmv1/third_party/terraform/go.sum b/mmv1/third_party/terraform/go.sum index 08015a6135c7..fb9d6362af7c 100644 --- a/mmv1/third_party/terraform/go.sum +++ b/mmv1/third_party/terraform/go.sum @@ -1432,3 +1432,5 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211109205522-6cd3cdca0637 h1:sFNz5neMQaa4CIRE2D35t5A84lps/ylOlAXE+ByRKho= github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211109205522-6cd3cdca0637/go.mod h1:oEeBHikdF/NrnUy0ornVaY1OT+jGvTqm+LQS0+ZDKzU= +github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211117235310-d31aef517fa2 h1:nEyJ0Cm2OP/ZVYBYRzatAvXeXAaUc3VLkWixaIqI034= +github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211117235310-d31aef517fa2/go.mod h1:oEeBHikdF/NrnUy0ornVaY1OT+jGvTqm+LQS0+ZDKzU= diff --git a/tpgtools/go.mod b/tpgtools/go.mod index 64f092941fb1..d3d42c3265d4 100644 --- a/tpgtools/go.mod +++ b/tpgtools/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( bitbucket.org/creachadair/stringset v0.0.9 - github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211109205522-6cd3cdca0637 + github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211117235310-d31aef517fa2 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/hashicorp/errwrap v1.0.0 github.com/hashicorp/hcl v1.0.0 diff --git a/tpgtools/go.sum b/tpgtools/go.sum index 24af299bdb41..1ded0c2e4865 100644 --- a/tpgtools/go.sum +++ b/tpgtools/go.sum @@ -36,8 +36,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211109205522-6cd3cdca0637 h1:sFNz5neMQaa4CIRE2D35t5A84lps/ylOlAXE+ByRKho= -github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211109205522-6cd3cdca0637/go.mod h1:oEeBHikdF/NrnUy0ornVaY1OT+jGvTqm+LQS0+ZDKzU= +github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211117235310-d31aef517fa2 h1:nEyJ0Cm2OP/ZVYBYRzatAvXeXAaUc3VLkWixaIqI034= +github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20211117235310-d31aef517fa2/go.mod h1:oEeBHikdF/NrnUy0ornVaY1OT+jGvTqm+LQS0+ZDKzU= github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE= github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= diff --git a/tpgtools/overrides/cloudbuild/beta/worker_pool.yaml b/tpgtools/overrides/cloudbuild/beta/worker_pool.yaml index cd0c1f24a8fe..e077a3db6f77 100644 --- a/tpgtools/overrides/cloudbuild/beta/worker_pool.yaml +++ b/tpgtools/overrides/cloudbuild/beta/worker_pool.yaml @@ -1,4 +1,6 @@ - type: DIFF_SUPPRESS_FUNC field: network_config.peered_network details: - diffsuppressfunc: compareResourceNames \ No newline at end of file + diffsuppressfunc: compareResourceNames +- type: EXCLUDE + field: etag diff --git a/tpgtools/overrides/cloudbuild/worker_pool.yaml b/tpgtools/overrides/cloudbuild/worker_pool.yaml index cd0c1f24a8fe..e077a3db6f77 100644 --- a/tpgtools/overrides/cloudbuild/worker_pool.yaml +++ b/tpgtools/overrides/cloudbuild/worker_pool.yaml @@ -1,4 +1,6 @@ - type: DIFF_SUPPRESS_FUNC field: network_config.peered_network details: - diffsuppressfunc: compareResourceNames \ No newline at end of file + diffsuppressfunc: compareResourceNames +- type: EXCLUDE + field: etag