updated DCL version to 1.9.0 for including changes in gkehub-configma… (#6090) (#4370)

* update DCL version to 1.9.0 for including changes for gkehub-configmanagement-configsync

* added tests and doc changes for gkehub-featuremembership-configsync

* cleaned go checksum

* added dcl hash in go.sum

* updated dcl version to 1.10 as there are errors with cloud deploy that is not related to this PR

* resolved merge conflicts with origin

* added skip vcr failure for "AddOns" and "ConfidentialNodes"

* reverted skipvcr changes to "Addons" and "ConfidentialNodes" test cases

Co-authored-by: Indu <[email protected]>
Signed-off-by: Modular Magician <[email protected]>

Co-authored-by: Indu <[email protected]>

Author: modular-magician

.changelog/6090.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+google_gke_hub_feature_membership: Changes to add `prevent_drift` field to `google_gke_hub_feature_membership:configmanagement:config_sync` resource (beta)
+```

go.mod

@@ -1,7 +1,7 @@
 module github.com/hashicorp/terraform-provider-google-beta
 require (
 	cloud.google.com/go/bigtable v1.13.0
-	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.8.2
+	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.10.0
 	github.com/apparentlymart/go-cidr v1.1.0
 	github.com/client9/misspell v0.3.4
 	github.com/davecgh/go-spew v1.1.1

go.sum

@@ -73,8 +73,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM=
 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.8.2 h1:V2EzqYSMPUkyKTtSevKTFU0Dw7nK6uVpg40U31Y0x/8=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.8.2/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.10.0 h1:zw07xH8x3MxhIG9dvof0FtIyr0iV3Wr7xCpGYMlgygU=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.10.0/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=

google-beta/resource_gke_hub_feature_membership.go

@@ -156,6 +156,13 @@ func GkeHubFeatureMembershipConfigmanagementConfigSyncSchema() *schema.Resource
 				Elem:        GkeHubFeatureMembershipConfigmanagementConfigSyncGitSchema(),
 			},
 
+			"prevent_drift": {
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Optional:    true,
+				Description: "Set to true to enable the Config Sync admission webhook to prevent drifts. If set to `false`, disables the Config Sync admission webhook and does not prevent drifts.",
+			},
+
 			"source_format": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -592,6 +599,7 @@ func expandGkeHubFeatureMembershipConfigmanagementConfigSync(o interface{}) *gke
 	obj := objArr[0].(map[string]interface{})
 	return &gkehub.FeatureMembershipConfigmanagementConfigSync{
 		Git:          expandGkeHubFeatureMembershipConfigmanagementConfigSyncGit(obj["git"]),
+		PreventDrift: dcl.Bool(obj["prevent_drift"].(bool)),
 		SourceFormat: dcl.String(obj["source_format"].(string)),
 	}
 }
@@ -602,6 +610,7 @@ func flattenGkeHubFeatureMembershipConfigmanagementConfigSync(obj *gkehub.Featur
 	}
 	transformed := map[string]interface{}{
 		"git":           flattenGkeHubFeatureMembershipConfigmanagementConfigSyncGit(obj.Git),
+		"prevent_drift": obj.PreventDrift,
 		"source_format": obj.SourceFormat,
 	}
 

google-beta/resource_gke_hub_feature_membership_test.go

@@ -341,6 +341,17 @@ func TestAccGkeHubFeatureMembership_gkehubFeatureAcmAllFields(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				Config: testAccGkeHubFeatureMembership_gkehubFeatureWithPreventDriftField(context),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGkeHubFeatureMembershipPresent(t, fmt.Sprintf("tf-test-gkehub%s", context["random_suffix"]), "global", "configmanagement", fmt.Sprintf("tf-test1%s", context["random_suffix"])),
+				),
+			},
+			{
+				ResourceName:      "google_gke_hub_feature_membership.feature_member",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -411,6 +422,73 @@ resource "google_gke_hub_feature_membership" "feature_member" {
 `, context)
 }
 
+func testAccGkeHubFeatureMembership_gkehubFeatureWithPreventDriftField(context map[string]interface{}) string {
+	return gkeHubFeatureProjectSetup(context) + Nprintf(`
+resource "google_container_cluster" "primary" {
+  project = google_project.project.project_id
+  name               = "tf-test-cl%{random_suffix}"
+  location           = "us-central1-a"
+  initial_node_count = 1
+  provider = google-beta
+  depends_on = [google_project_service.mci, google_project_service.container, google_project_service.container, google_project_service.gkehub]
+}
+
+resource "google_gke_hub_membership" "membership" {
+  project = google_project.project.project_id
+  membership_id = "tf-test1%{random_suffix}"
+  endpoint {
+    gke_cluster {
+      resource_link = "//container.googleapis.com/${google_container_cluster.primary.id}"
+    }
+  }
+  description = "test resource."
+  provider = google-beta
+}
+
+resource "google_gke_hub_feature" "feature" {
+  project = google_project.project.project_id
+  name = "configmanagement"
+  location = "global"
+
+  labels = {
+    foo = "bar"
+  }
+  provider = google-beta
+  depends_on = [google_project_service.mci, google_project_service.container, google_project_service.container, google_project_service.gkehub]
+}
+
+resource "google_gke_hub_feature_membership" "feature_member" {
+  project = google_project.project.project_id
+  location = "global"
+  feature = google_gke_hub_feature.feature.name
+  membership = google_gke_hub_membership.membership.membership_id
+  configmanagement {
+    version = "1.10.1"
+    config_sync {
+      git {
+        sync_repo = "https://github.com/hashicorp/terraform"
+        https_proxy = "https://example.com"
+        policy_dir = "google/"
+        sync_branch = "some-branch"
+        sync_rev = "v3.60.0"
+        sync_wait_secs = "30"
+      }
+      prevent_drift = true
+    }
+    policy_controller {
+      enabled = true
+      audit_interval_seconds = "100"
+      exemptable_namespaces = ["onetwothree", "fourfive"]
+      template_library_installed = true
+      referential_rules_enabled = true
+      log_denies_enabled = true
+    }
+  }
+  provider = google-beta
+}
+`, context)
+}
+
 func testAccGkeHubFeatureMembership_gkehubFeatureAcmFewFields(context map[string]interface{}) string {
 	return gkeHubFeatureProjectSetup(context) + Nprintf(`
 resource "google_container_cluster" "primary" {

website/docs/r/clouddeploy_delivery_pipeline.html.markdown

@@ -18,12 +18,12 @@ layout: "google"
 page_title: "Google: google_clouddeploy_delivery_pipeline"
 sidebar_current: "docs-google-clouddeploy-delivery-pipeline"
 description: |-
-  The Clouddeploy DeliveryPipeline resource
+  The Cloud Deploy `DeliveryPipeline` resource
 ---
 
 # google_clouddeploy_delivery_pipeline
 
-The Clouddeploy DeliveryPipeline resource
+The Cloud Deploy `DeliveryPipeline` resource
 
 ## Example Usage - delivery_pipeline
 Creates a basic Cloud Deploy delivery pipeline

website/docs/r/clouddeploy_target.html.markdown

@@ -18,12 +18,12 @@ layout: "google"
 page_title: "Google: google_clouddeploy_target"
 sidebar_current: "docs-google-clouddeploy-target"
 description: |-
-  The Clouddeploy Target resource
+  The Cloud Deploy `Target` resource
 ---
 
 # google_clouddeploy_target
 
-The Clouddeploy Target resource
+The Cloud Deploy `Target` resource
 
 ## Example Usage - target
 Creates a basic Cloud Deploy target

website/docs/r/gke_hub_feature_membership.html.markdown

@@ -134,7 +134,10 @@ The following arguments are supported:
 
 * `git` -
   (Optional) Structure is [documented below](#nested_git).
-  
+
+* `prevent_drift` -
+  (Optional)
+  Supported from ACM versions 1.10.0 onwards. Set to true to enable the Config Sync admission webhook to prevent drifts. If set to "false", disables the Config Sync admission webhook and does not prevent drifts.
 
 * `source_format` -
   (Optional)