Upgrade dcl version to v1.49.0 (#8706) (#15564)

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

Author: modular-magician

.changelog/8706.txt

@@ -0,0 +1,6 @@
+```release-note:enhancement
+clouddeploy: promoted `multi_target` to GA in `google_clouddelploy_target`
+```
+```release-note:enhancement
+containeraws: made `config.labels` updatable in `google_container_aws_node_pool`
+```

go.mod

@@ -3,7 +3,7 @@ go 1.19
 
 require (
 	cloud.google.com/go/bigtable v1.19.0
-	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.48.0
+	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.49.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.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHS
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/GoogleCloudPlatform/declarative-resource-client-library v1.48.0 h1:+1lMwM8ZN8IGqYnSn2qh3Kb0fBBf9SwB+7yPBtcpNsM=
 github.com/GoogleCloudPlatform/declarative-resource-client-library v1.48.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.49.0 h1:XvQtlNIEx3wMIXa+eymDIqYO5gvjYoMsi3XF2fblKmM=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.49.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/services/clouddeploy/resource_clouddeploy_target.go

@@ -79,7 +79,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"},
 			},
 
 			"deploy_parameters": {
@@ -109,7 +109,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": {
@@ -119,6 +119,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,
@@ -140,7 +149,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": {
@@ -249,6 +258,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{
@@ -278,6 +300,7 @@ func resourceClouddeployTargetCreate(d *schema.ResourceData, meta interface{}) e
 		ExecutionConfigs: expandClouddeployTargetExecutionConfigsArray(d.Get("execution_configs")),
 		Gke:              expandClouddeployTargetGke(d.Get("gke")),
 		Labels:           tpgresource.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")),
@@ -337,6 +360,7 @@ func resourceClouddeployTargetRead(d *schema.ResourceData, meta interface{}) err
 		ExecutionConfigs: expandClouddeployTargetExecutionConfigsArray(d.Get("execution_configs")),
 		Gke:              expandClouddeployTargetGke(d.Get("gke")),
 		Labels:           tpgresource.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")),
@@ -391,6 +415,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)
 	}
@@ -435,6 +462,7 @@ func resourceClouddeployTargetUpdate(d *schema.ResourceData, meta interface{}) e
 		ExecutionConfigs: expandClouddeployTargetExecutionConfigsArray(d.Get("execution_configs")),
 		Gke:              expandClouddeployTargetGke(d.Get("gke")),
 		Labels:           tpgresource.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")),
@@ -489,6 +517,7 @@ func resourceClouddeployTargetDelete(d *schema.ResourceData, meta interface{}) e
 		ExecutionConfigs: expandClouddeployTargetExecutionConfigsArray(d.Get("execution_configs")),
 		Gke:              expandClouddeployTargetGke(d.Get("gke")),
 		Labels:           tpgresource.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")),
@@ -657,6 +686,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: tpgdclresource.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/services/containeraws/resource_container_aws_node_pool.go

@@ -221,7 +221,6 @@ func ContainerAwsNodePoolConfigSchema() *schema.Resource {
 			"labels": {
 				Type:        schema.TypeMap,
 				Optional:    true,
-				ForceNew:    true,
 				Description: "Optional. The initial labels assigned to nodes of this node pool. An object containing a list of \"key\": value pairs. Example: { \"name\": \"wrench\", \"mass\": \"1.3kg\", \"count\": \"3\" }.",
 				Elem:        &schema.Schema{Type: schema.TypeString},
 			},

website/docs/r/clouddeploy_target.html.markdown

@@ -178,7 +178,7 @@ The following arguments are supported:
 
 * `multi_target` -
   (Optional)
-  (Beta only) Information specifying a multiTarget.
+  Information specifying a multiTarget.
 
 * `project` -
   (Optional)