fixes to the feature branch to get it building (#14732)

Author: c2thorn

mmv1/products/datafusion/Instance.yaml

@@ -13,7 +13,7 @@
 
 ---
 name: 'Instance'
-plugin_framework: true
+# plugin_framework: true
 description: |
   Represents a Data Fusion instance.
 references:

mmv1/templates/terraform/pre_update/datafusion_instance_update.go.tmpl

@@ -12,24 +12,22 @@
 */ -}}
 updateMask := []string{}
 
-if !plan.EnableStackdriverLogging.Equal(state.EnableStackdriverLogging) {
+if d.HasChange("enable_stackdriver_logging") {
 	updateMask = append(updateMask, "enableStackdriverLogging")
 }
 
-if !plan.EnableStackdriverMonitoring.Equal(state.EnableStackdriverMonitoring) {
+if d.HasChange("enable_stackdriver_monitoring") {
 	updateMask = append(updateMask, "enableStackdriverMonitoring")
 }
 
-if !plan.EnableRbac.Equal(state.EnableRbac) {
-	updateMask = append(updateMask, "enableRbac")
+if d.HasChange("enable_rbac") {
+    updateMask = append(updateMask, "enableRbac")
 }
 
-
 // updateMask is a URL parameter but not present in the schema, so ReplaceVars
 // won't set it
 
-url, err := transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})
+url, err = transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})
 if err != nil {
-  resp.Diagnostics.AddError("Error, failure building update mask query parameters in {{ $.Name -}}", err.Error())
-  return
+    return err
 }

mmv1/templates/terraform/pre_update/fw_datafusion_instance_update.go.tmpl

@@ -0,0 +1,35 @@
+{{/*
+	The license inside this block applies to this file
+	Copyright 2024 Google Inc.
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/ -}}
+updateMask := []string{}
+
+if !plan.EnableStackdriverLogging.Equal(state.EnableStackdriverLogging) {
+	updateMask = append(updateMask, "enableStackdriverLogging")
+}
+
+if !plan.EnableStackdriverMonitoring.Equal(state.EnableStackdriverMonitoring) {
+	updateMask = append(updateMask, "enableStackdriverMonitoring")
+}
+
+if !plan.EnableRbac.Equal(state.EnableRbac) {
+	updateMask = append(updateMask, "enableRbac")
+}
+
+
+// updateMask is a URL parameter but not present in the schema, so ReplaceVars
+// won't set it
+
+url, err := transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})
+if err != nil {
+  resp.Diagnostics.AddError("Error, failure building update mask query parameters in {{ $.Name -}}", err.Error())
+  return
+}

mmv1/third_party/terraform/services/container/node_config.go.tmpl

@@ -1294,12 +1294,6 @@ func expandNodeConfig(v interface{}) *container.NodeConfig {
 		nc.FlexStart = v.(bool)
 	}
 
-	{{ if ne $.TargetVersionName `ga` -}}
-	if v,ok := nodeConfig["flex_start"]; ok {
-		nc.FlexStart = v.(bool)
-	}
-	{{- end }}
-
 	{{ if ne $.TargetVersionName `ga` -}}
 	if v, ok := nodeConfig["host_maintenance_policy"]; ok {
 		nc.HostMaintenancePolicy = expandHostMaintenancePolicy(v)

mmv1/third_party/terraform/services/dataflow/resource_dataflow_flex_template_job_test.go.tmpl

@@ -407,40 +407,6 @@ func TestAccDataflowFlexTemplateJob_withAdditionalPipelineOptions(t *testing.T)
 	})
 }
 
-func TestAccDataflowFlexTemplateJob_withAdditionalPipelineOptions(t *testing.T) {
-	// Dataflow responses include serialized java classes and bash commands
-	// This makes body comparison infeasible
-	acctest.SkipIfVcr(t)
-	t.Parallel()
-
-	randStr := acctest.RandString(t, 10)
-	job := "tf-test-dataflow-job-" + randStr
-	additionalPipelineOptions := []string{"numberOfWorkerHarnessThreads=200"}
-	bucket := "tf-test-dataflow-bucket-" + randStr
-	topic := "tf-test-topic" + randStr
-
-	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckDataflowJobDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccDataflowFlexTemplateJob_additionalPipelineOptions(job, bucket, topic, additionalPipelineOptions),
-				Check: resource.ComposeTestCheckFunc(
-					testAccDataflowFlexJobExists(t, "google_dataflow_flex_template_job.flex_job_pipeline_options", false),
-					testAccDataflowFlexTemplateJobHasAdditionalPipelineOptions(t, "google_dataflow_flex_template_job.flex_job_pipeline_options", additionalPipelineOptions, false),
-				),
-			},
-			{
-				ResourceName:            "google_dataflow_flex_template_job.flex_job_pipeline_options",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "state", "additional_pipeline_options", "container_spec_gcs_path", "labels", "terraform_labels"},
-			},
-		},
-	})
-}
-
 func TestAccDataflowFlexTemplateJob_withProviderDefaultLabels(t *testing.T) {
 	// This resource uses custom retry logic that cannot be sped up without
 	// modifying the actual resource
@@ -2191,4 +2157,4 @@ resource "google_dataflow_flex_template_job" "flex_job" {
 `, context)
 }
 
-{{- end }}
+{{- end }}

mmv1/third_party/terraform/services/dns/resource_dns_managed_zone_test.go.tmpl

@@ -721,66 +721,6 @@ resource "google_compute_network" "network-1" {
 }
 
 {{ if not (or (eq $.TargetVersionName ``) (eq $.TargetVersionName `ga`)) }}
-func TestAccDNSManagedZone_privateForwardingWithDomainNameUpdate(t *testing.T) {
-	t.Parallel()
-
-	zoneSuffix := acctest.RandString(t, 10)
-
-	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
-		CheckDestroy:             testAccCheckDNSManagedZoneDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccDnsManagedZone_privateForwardingWithDomainNameUpdate(zoneSuffix, "dns.infra.foo.com.", "private"),
-			},
-			{
-				ResourceName:      "google_dns_managed_zone.private",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			{
-				Config: testAccDnsManagedZone_privateForwardingWithDomainNameUpdate(zoneSuffix, "dns.infra.goo.com.", "default"),
-			},
-			{
-				ResourceName:      "google_dns_managed_zone.private",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
-func testAccDnsManagedZone_privateForwardingWithDomainNameUpdate(suffix, domain_name, forwarding_path string) string {
-	return fmt.Sprintf(`
-resource "google_dns_managed_zone" "private" {
-  provider = google-beta
-  name        = "private-zone-%s"
-  dns_name    = "private.example.com."
-  description = "Example private DNS zone"
-  visibility  = "private"
-  private_visibility_config {
-    networks {
-      network_url = google_compute_network.network-1.self_link
-    }
-  }
-
-  forwarding_config {
-    target_name_servers {
-      domain_name = "%s"
-      forwarding_path = "%s"
-    }
-  }
-}
-
-resource "google_compute_network" "network-1" {
-  provider = google-beta
-  name                    = "tf-test-net-1-%s"
-  auto_create_subnetworks = false
-}
-`, suffix, domain_name, forwarding_path, suffix)
-}
-
 func TestAccDNSManagedZone_dnsManagedZoneUpdateWithServiceDirectory(t *testing.T) {
 	t.Parallel()
 
@@ -888,4 +828,4 @@ resource "google_compute_network" "network" {
 }
 `, context)
 }
-{{- end }}
+{{- end }}

mmv1/third_party/terraform/website/docs/r/container_cluster.html.markdown

@@ -1269,17 +1269,6 @@ notification_config {
 * `control_plane_disk_encryption_key` - (Optional) The Cloud KMS cryptoKey to use for Confidential Hyperdisk on the control plane nodes.
 * `gkeops_etcd_backup_encryption_key` - (Optional) Resource path of the Cloud KMS cryptoKey to use for encryption of internal etcd backups.
 
-<a name="nested_user_managed_keys_config"></a>The `user_managed_keys_config` block supports:
-
-* `cluster_ca` - (Optional) The Certificate Authority Service caPool to use for the cluster CA in this cluster.
-* `etcd_api_ca` - (Optional) The Certificate Authority Service caPool to use for the etcd API CA in this cluster.
-* `etcd_peer_ca` - (Optional) The Certificate Authority Service caPool to use for the etcd peer CA in this cluster.
-* `aggregation_ca` - (Optional) The Certificate Authority Service caPool to use for the aggreation CA in this cluster.
-* `service_account_signing_keys` - (Optional) The Cloud KMS cryptoKeyVersions to use for signing service account JWTs issued by this cluster.
-* `service_account_verification_keys` - (Optional) The Cloud KMS cryptoKeyVersions to use for verifying service account JWTs issued by this cluster.
-* `control_plane_disk_encryption_key` - (Optional) The Cloud KMS cryptoKey to use for Confidential Hyperdisk on the control plane nodes.
-* `gkeops_etcd_backup_encryption_key` - (Optional) Resource path of the Cloud KMS cryptoKey to use for encryption of internal etcd backups.
-
 <a name="nested_control_plane_endpoints_config"></a>The `control_plane_endpoints_config` block supports:
 
 * `dns_endpoint_config` - (Optional) DNS endpoint configuration.