Upgrade DCL to v1.34 (#7276) (#5258)

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

Author: modular-magician

.changelog/7276.txt

@@ -0,0 +1,12 @@
+```release-note:enhancement
+containerazure: added `azure_services_authentication` to `google_container_azure_cluster`
+```
+```release-note:deprecation
+gkehub: deprecated `mesh.control_plane` in `google_gke_hub_feature_membership`. Use `mesh.management` instead (beta-only)
+```
+```release-note:enhancement
+cloudbuild: added `peered_network_ip_range` field to `google_cloudbuild_worker_pool` resource
+```
+```release-note:enhancement
+clouddeploy: added `multi_target` field to `google_clouddeploy_target` resource (beta-only)
+```

go.mod

@@ -3,7 +3,7 @@ go 1.18
 
 require (
 	cloud.google.com/go/bigtable v1.17.0
-	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.31.0
+	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.34.0
 	github.com/apparentlymart/go-cidr v1.1.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/dnaeon/go-vcr v1.0.1

go.sum

@@ -17,6 +17,8 @@ cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/GoogleCloudPlatform/declarative-resource-client-library v1.31.0 h1:4Orb9zAllU52CUtZfKu9OWYyDK6neeBt2ye6NKqAfOg=
 github.com/GoogleCloudPlatform/declarative-resource-client-library v1.31.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.34.0 h1:o7t+hPFv+Ax5O2vxzIH7dEtvlWA7JJOlOd7mWFvMa6s=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.34.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
 github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=

google-beta/resource_cloudbuild_worker_pool.go

@@ -142,6 +142,13 @@ func CloudbuildWorkerPoolNetworkConfigSchema() *schema.Resource {
 				DiffSuppressFunc: compareResourceNames,
 				Description:      "Required. Immutable. The network definition that the workers are peered to. If this section is left empty, the workers will be peered to `WorkerPool.project_id` on the service producer network. Must be in the format `projects/{project}/global/networks/{network}`, where `{project}` is a project number, such as `12345`, and `{network}` is the name of a VPC network in the project. See [Understanding network configuration options](https://cloud.google.com/cloud-build/docs/custom-workers/set-up-custom-worker-pool-environment#understanding_the_network_configuration_options)",
 			},
+
+			"peered_network_ip_range": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "Optional. Immutable. Subnet IP range within the peered network. This is specified in CIDR notation with a slash and the subnet prefix size. You can optionally specify an IP address before the subnet prefix value. e.g. `192.168.0.0/29` would specify an IP range starting at 192.168.0.0 with a prefix size of 29 bits. `/16` would specify a prefix size of 16 bits, with an automatically determined IP within the peered VPC. If unspecified, a value of `/24` will be used.",
+			},
 		},
 	}
 }
@@ -425,7 +432,8 @@ func expandCloudbuildWorkerPoolNetworkConfig(o interface{}) *cloudbuild.WorkerPo
 	}
 	obj := objArr[0].(map[string]interface{})
 	return &cloudbuild.WorkerPoolNetworkConfig{
-		PeeredNetwork: dcl.String(obj["peered_network"].(string)),
+		PeeredNetwork:        dcl.String(obj["peered_network"].(string)),
+		PeeredNetworkIPRange: dcl.String(obj["peered_network_ip_range"].(string)),
 	}
 }
 
@@ -434,7 +442,8 @@ func flattenCloudbuildWorkerPoolNetworkConfig(obj *cloudbuild.WorkerPoolNetworkC
 		return nil
 	}
 	transformed := map[string]interface{}{
-		"peered_network": obj.PeeredNetwork,
+		"peered_network":          obj.PeeredNetwork,
+		"peered_network_ip_range": obj.PeeredNetworkIPRange,
 	}
 
 	return []interface{}{transformed}

google-beta/resource_cloudbuild_worker_pool_test.go

@@ -150,6 +150,7 @@ resource "google_cloudbuild_worker_pool" "pool" {
 	}
 	network_config {
 		peered_network = google_compute_network.network.id
+		peered_network_ip_range = "/29"
 	}
 	depends_on = [google_service_networking_connection.worker_pool_conn]
 }

google-beta/resource_clouddeploy_target.go

@@ -72,7 +72,7 @@ func ResourceClouddeployTarget() *schema.Resource {
 				Description:   "Information specifying an Anthos Cluster.",
 				MaxItems:      1,
 				Elem:          ClouddeployTargetAnthosClusterSchema(),
-				ConflictsWith: []string{"gke", "run"},
+				ConflictsWith: []string{"gke", "run", "multi_target"},
 			},
 
 			"description": {
@@ -95,7 +95,7 @@ func ResourceClouddeployTarget() *schema.Resource {
 				Description:   "Information specifying a GKE Cluster.",
 				MaxItems:      1,
 				Elem:          ClouddeployTargetGkeSchema(),
-				ConflictsWith: []string{"anthos_cluster", "run"},
+				ConflictsWith: []string{"anthos_cluster", "run", "multi_target"},
 			},
 
 			"labels": {
@@ -105,6 +105,15 @@ func ResourceClouddeployTarget() *schema.Resource {
 				Elem:        &schema.Schema{Type: schema.TypeString},
 			},
 
+			"multi_target": {
+				Type:          schema.TypeList,
+				Optional:      true,
+				Description:   "Information specifying a multiTarget.",
+				MaxItems:      1,
+				Elem:          ClouddeployTargetMultiTargetSchema(),
+				ConflictsWith: []string{"gke", "anthos_cluster", "run"},
+			},
+
 			"project": {
 				Type:             schema.TypeString,
 				Computed:         true,
@@ -126,7 +135,7 @@ func ResourceClouddeployTarget() *schema.Resource {
 				Description:   "Information specifying a Cloud Run deployment target.",
 				MaxItems:      1,
 				Elem:          ClouddeployTargetRunSchema(),
-				ConflictsWith: []string{"gke", "anthos_cluster"},
+				ConflictsWith: []string{"gke", "anthos_cluster", "multi_target"},
 			},
 
 			"create_time": {
@@ -235,6 +244,19 @@ func ClouddeployTargetGkeSchema() *schema.Resource {
 	}
 }
 
+func ClouddeployTargetMultiTargetSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"target_ids": {
+				Type:        schema.TypeList,
+				Required:    true,
+				Description: "Required. The target_ids of this multiTarget.",
+				Elem:        &schema.Schema{Type: schema.TypeString},
+			},
+		},
+	}
+}
+
 func ClouddeployTargetRunSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -263,6 +285,7 @@ func resourceClouddeployTargetCreate(d *schema.ResourceData, meta interface{}) e
 		ExecutionConfigs: expandClouddeployTargetExecutionConfigsArray(d.Get("execution_configs")),
 		Gke:              expandClouddeployTargetGke(d.Get("gke")),
 		Labels:           checkStringMap(d.Get("labels")),
+		MultiTarget:      expandClouddeployTargetMultiTarget(d.Get("multi_target")),
 		Project:          dcl.String(project),
 		RequireApproval:  dcl.Bool(d.Get("require_approval").(bool)),
 		Run:              expandClouddeployTargetRun(d.Get("run")),
@@ -321,6 +344,7 @@ func resourceClouddeployTargetRead(d *schema.ResourceData, meta interface{}) err
 		ExecutionConfigs: expandClouddeployTargetExecutionConfigsArray(d.Get("execution_configs")),
 		Gke:              expandClouddeployTargetGke(d.Get("gke")),
 		Labels:           checkStringMap(d.Get("labels")),
+		MultiTarget:      expandClouddeployTargetMultiTarget(d.Get("multi_target")),
 		Project:          dcl.String(project),
 		RequireApproval:  dcl.Bool(d.Get("require_approval").(bool)),
 		Run:              expandClouddeployTargetRun(d.Get("run")),
@@ -372,6 +396,9 @@ func resourceClouddeployTargetRead(d *schema.ResourceData, meta interface{}) err
 	if err = d.Set("labels", res.Labels); err != nil {
 		return fmt.Errorf("error setting labels in state: %s", err)
 	}
+	if err = d.Set("multi_target", flattenClouddeployTargetMultiTarget(res.MultiTarget)); err != nil {
+		return fmt.Errorf("error setting multi_target in state: %s", err)
+	}
 	if err = d.Set("project", res.Project); err != nil {
 		return fmt.Errorf("error setting project in state: %s", err)
 	}
@@ -415,6 +442,7 @@ func resourceClouddeployTargetUpdate(d *schema.ResourceData, meta interface{}) e
 		ExecutionConfigs: expandClouddeployTargetExecutionConfigsArray(d.Get("execution_configs")),
 		Gke:              expandClouddeployTargetGke(d.Get("gke")),
 		Labels:           checkStringMap(d.Get("labels")),
+		MultiTarget:      expandClouddeployTargetMultiTarget(d.Get("multi_target")),
 		Project:          dcl.String(project),
 		RequireApproval:  dcl.Bool(d.Get("require_approval").(bool)),
 		Run:              expandClouddeployTargetRun(d.Get("run")),
@@ -468,6 +496,7 @@ func resourceClouddeployTargetDelete(d *schema.ResourceData, meta interface{}) e
 		ExecutionConfigs: expandClouddeployTargetExecutionConfigsArray(d.Get("execution_configs")),
 		Gke:              expandClouddeployTargetGke(d.Get("gke")),
 		Labels:           checkStringMap(d.Get("labels")),
+		MultiTarget:      expandClouddeployTargetMultiTarget(d.Get("multi_target")),
 		Project:          dcl.String(project),
 		RequireApproval:  dcl.Bool(d.Get("require_approval").(bool)),
 		Run:              expandClouddeployTargetRun(d.Get("run")),
@@ -636,6 +665,32 @@ func flattenClouddeployTargetGke(obj *clouddeploy.TargetGke) interface{} {
 
 }
 
+func expandClouddeployTargetMultiTarget(o interface{}) *clouddeploy.TargetMultiTarget {
+	if o == nil {
+		return clouddeploy.EmptyTargetMultiTarget
+	}
+	objArr := o.([]interface{})
+	if len(objArr) == 0 || objArr[0] == nil {
+		return clouddeploy.EmptyTargetMultiTarget
+	}
+	obj := objArr[0].(map[string]interface{})
+	return &clouddeploy.TargetMultiTarget{
+		TargetIds: expandStringArray(obj["target_ids"]),
+	}
+}
+
+func flattenClouddeployTargetMultiTarget(obj *clouddeploy.TargetMultiTarget) interface{} {
+	if obj == nil || obj.Empty() {
+		return nil
+	}
+	transformed := map[string]interface{}{
+		"target_ids": obj.TargetIds,
+	}
+
+	return []interface{}{transformed}
+
+}
+
 func expandClouddeployTargetRun(o interface{}) *clouddeploy.TargetRun {
 	if o == nil {
 		return clouddeploy.EmptyTargetRun

google-beta/resource_clouddeploy_target_generated_test.go

@@ -26,6 +26,40 @@ import (
 	"testing"
 )
 
+func TestAccClouddeployTarget_MultiTarget(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"project_name":  getTestProjectFromEnv(),
+		"region":        getTestRegionFromEnv(),
+		"random_suffix": randString(t, 10),
+	}
+
+	vcrTest(t, resource.TestCase{
+		PreCheck: func() { testAccPreCheck(t) },
+
+		Providers:    testAccProvidersOiCS,
+		CheckDestroy: testAccCheckClouddeployTargetDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccClouddeployTarget_MultiTarget(context),
+			},
+			{
+				ResourceName:      "google_clouddeploy_target.primary",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccClouddeployTarget_MultiTargetUpdate0(context),
+			},
+			{
+				ResourceName:      "google_clouddeploy_target.primary",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
 func TestAccClouddeployTarget_RunTarget(t *testing.T) {
 	t.Parallel()
 
@@ -118,6 +152,75 @@ func TestAccClouddeployTarget_Target(t *testing.T) {
 	})
 }
 
+func testAccClouddeployTarget_MultiTarget(context map[string]interface{}) string {
+	return Nprintf(`
+resource "google_clouddeploy_target" "primary" {
+  location = "%{region}"
+  name     = "tf-test-target%{random_suffix}"
+
+  annotations = {
+    my_first_annotation = "example-annotation-1"
+
+    my_second_annotation = "example-annotation-2"
+  }
+
+  description = "multi-target description"
+
+  execution_configs {
+    usages            = ["RENDER", "DEPLOY"]
+    execution_timeout = "3600s"
+  }
+
+  labels = {
+    my_first_label = "example-label-1"
+
+    my_second_label = "example-label-2"
+  }
+
+  multi_target {
+    target_ids = ["1", "2"]
+  }
+
+  project          = "%{project_name}"
+  require_approval = false
+  provider = google-beta
+}
+
+`, context)
+}
+
+func testAccClouddeployTarget_MultiTargetUpdate0(context map[string]interface{}) string {
+	return Nprintf(`
+resource "google_clouddeploy_target" "primary" {
+  location = "%{region}"
+  name     = "tf-test-target%{random_suffix}"
+
+  annotations = {
+    my_second_annotation = "updated-example-annotation-2"
+
+    my_third_annotation = "example-annotation-3"
+  }
+
+  description = "updated mutli-target description"
+
+  labels = {
+    my_second_label = "example-label-2"
+
+    my_third_label = "example-label-3"
+  }
+
+  multi_target {
+    target_ids = ["1", "2", "3"]
+  }
+
+  project          = "%{project_name}"
+  require_approval = true
+  provider = google-beta
+}
+
+`, context)
+}
+
 func testAccClouddeployTarget_RunTarget(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_clouddeploy_target" "primary" {