Upgrade DCL to v1.31.0 (#7109) (#5084)

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

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

Author: modular-magician

.changelog/7109.txt

@@ -0,0 +1,6 @@
+```release-note:enhancement
+container: added update support for `google_container_aws_node_pool` `tags` field
+```
+```release-note:enhancement
+container: added `google_container_aws_node_pool` `autoscaling_metrics_collection` field
+```

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.30.0
+	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.31.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

@@ -63,20 +63,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.28.0 h1:QRloCSdH4JGX5H4wie8D4WeM4/TaqniVf/d/hnkrqLo=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.28.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.29.0 h1:RmGDbvUWkRLYyWngSad04GR4LAnqflbXvzI1iBO2+rU=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.29.0 h1:RmGDbvUWkRLYyWngSad04GR4LAnqflbXvzI1iBO2+rU=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.29.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.29.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.29.1-0.20221217025133-b2d522d3684b h1:RgZjFUQKRCJV61R5emEFGhDOX84D0BPZG+p/E0hilSk=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.29.1-0.20221217025133-b2d522d3684b h1:RgZjFUQKRCJV61R5emEFGhDOX84D0BPZG+p/E0hilSk=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.29.1-0.20221217025133-b2d522d3684b/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.29.1-0.20221217025133-b2d522d3684b/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.30.0 h1:1DMSUzQO2osKXy03/xZmr5n8bMlW3RyMhHR2JpkkVzY=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.30.0 h1:1DMSUzQO2osKXy03/xZmr5n8bMlW3RyMhHR2JpkkVzY=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.30.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.30.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
+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/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_container_aws_node_pool.go

@@ -195,6 +195,14 @@ func ContainerAwsNodePoolConfigSchema() *schema.Resource {
 				Description: "The name of the AWS IAM role assigned to nodes in the pool.",
 			},
 
+			"autoscaling_metrics_collection": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				Description: "Optional. Configuration related to CloudWatch metrics collection on the Auto Scaling group of the node pool. When unspecified, metrics collection is disabled.",
+				MaxItems:    1,
+				Elem:        ContainerAwsNodePoolConfigAutoscalingMetricsCollectionSchema(),
+			},
+
 			"image_type": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -264,7 +272,6 @@ func ContainerAwsNodePoolConfigSchema() *schema.Resource {
 			"tags": {
 				Type:        schema.TypeMap,
 				Optional:    true,
-				ForceNew:    true,
 				Description: "Optional. Key/value metadata to assign to each underlying AWS resource. Specify at most 50 pairs containing alphanumerics, spaces, and symbols (.+-=_:@/). Keys can be up to 127 Unicode characters. Values can be up to 255 Unicode characters.",
 				Elem:        &schema.Schema{Type: schema.TypeString},
 			},
@@ -292,6 +299,25 @@ func ContainerAwsNodePoolConfigConfigEncryptionSchema() *schema.Resource {
 	}
 }
 
+func ContainerAwsNodePoolConfigAutoscalingMetricsCollectionSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"granularity": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "The frequency at which EC2 Auto Scaling sends aggregated data to AWS CloudWatch. The only valid value is \"1Minute\".",
+			},
+
+			"metrics": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				Description: "The metrics to enable. For a list of valid metrics, see https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_EnableMetricsCollection.html. If you specify granularity and don't specify any metrics, all metrics are enabled.",
+				Elem:        &schema.Schema{Type: schema.TypeString},
+			},
+		},
+	}
+}
+
 func ContainerAwsNodePoolConfigInstancePlacementSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -715,18 +741,19 @@ func expandContainerAwsNodePoolConfig(o interface{}) *containeraws.NodePoolConfi
 	}
 	obj := objArr[0].(map[string]interface{})
 	return &containeraws.NodePoolConfig{
-		ConfigEncryption:   expandContainerAwsNodePoolConfigConfigEncryption(obj["config_encryption"]),
-		IamInstanceProfile: dcl.String(obj["iam_instance_profile"].(string)),
-		ImageType:          dcl.StringOrNil(obj["image_type"].(string)),
-		InstancePlacement:  expandContainerAwsNodePoolConfigInstancePlacement(obj["instance_placement"]),
-		InstanceType:       dcl.StringOrNil(obj["instance_type"].(string)),
-		Labels:             checkStringMap(obj["labels"]),
-		ProxyConfig:        expandContainerAwsNodePoolConfigProxyConfig(obj["proxy_config"]),
-		RootVolume:         expandContainerAwsNodePoolConfigRootVolume(obj["root_volume"]),
-		SecurityGroupIds:   expandStringArray(obj["security_group_ids"]),
-		SshConfig:          expandContainerAwsNodePoolConfigSshConfig(obj["ssh_config"]),
-		Tags:               checkStringMap(obj["tags"]),
-		Taints:             expandContainerAwsNodePoolConfigTaintsArray(obj["taints"]),
+		ConfigEncryption:             expandContainerAwsNodePoolConfigConfigEncryption(obj["config_encryption"]),
+		IamInstanceProfile:           dcl.String(obj["iam_instance_profile"].(string)),
+		AutoscalingMetricsCollection: expandContainerAwsNodePoolConfigAutoscalingMetricsCollection(obj["autoscaling_metrics_collection"]),
+		ImageType:                    dcl.StringOrNil(obj["image_type"].(string)),
+		InstancePlacement:            expandContainerAwsNodePoolConfigInstancePlacement(obj["instance_placement"]),
+		InstanceType:                 dcl.StringOrNil(obj["instance_type"].(string)),
+		Labels:                       checkStringMap(obj["labels"]),
+		ProxyConfig:                  expandContainerAwsNodePoolConfigProxyConfig(obj["proxy_config"]),
+		RootVolume:                   expandContainerAwsNodePoolConfigRootVolume(obj["root_volume"]),
+		SecurityGroupIds:             expandStringArray(obj["security_group_ids"]),
+		SshConfig:                    expandContainerAwsNodePoolConfigSshConfig(obj["ssh_config"]),
+		Tags:                         checkStringMap(obj["tags"]),
+		Taints:                       expandContainerAwsNodePoolConfigTaintsArray(obj["taints"]),
 	}
 }
 
@@ -735,18 +762,19 @@ func flattenContainerAwsNodePoolConfig(obj *containeraws.NodePoolConfig) interfa
 		return nil
 	}
 	transformed := map[string]interface{}{
-		"config_encryption":    flattenContainerAwsNodePoolConfigConfigEncryption(obj.ConfigEncryption),
-		"iam_instance_profile": obj.IamInstanceProfile,
-		"image_type":           obj.ImageType,
-		"instance_placement":   flattenContainerAwsNodePoolConfigInstancePlacement(obj.InstancePlacement),
-		"instance_type":        obj.InstanceType,
-		"labels":               obj.Labels,
-		"proxy_config":         flattenContainerAwsNodePoolConfigProxyConfig(obj.ProxyConfig),
-		"root_volume":          flattenContainerAwsNodePoolConfigRootVolume(obj.RootVolume),
-		"security_group_ids":   obj.SecurityGroupIds,
-		"ssh_config":           flattenContainerAwsNodePoolConfigSshConfig(obj.SshConfig),
-		"tags":                 obj.Tags,
-		"taints":               flattenContainerAwsNodePoolConfigTaintsArray(obj.Taints),
+		"config_encryption":              flattenContainerAwsNodePoolConfigConfigEncryption(obj.ConfigEncryption),
+		"iam_instance_profile":           obj.IamInstanceProfile,
+		"autoscaling_metrics_collection": flattenContainerAwsNodePoolConfigAutoscalingMetricsCollection(obj.AutoscalingMetricsCollection),
+		"image_type":                     obj.ImageType,
+		"instance_placement":             flattenContainerAwsNodePoolConfigInstancePlacement(obj.InstancePlacement),
+		"instance_type":                  obj.InstanceType,
+		"labels":                         obj.Labels,
+		"proxy_config":                   flattenContainerAwsNodePoolConfigProxyConfig(obj.ProxyConfig),
+		"root_volume":                    flattenContainerAwsNodePoolConfigRootVolume(obj.RootVolume),
+		"security_group_ids":             obj.SecurityGroupIds,
+		"ssh_config":                     flattenContainerAwsNodePoolConfigSshConfig(obj.SshConfig),
+		"tags":                           obj.Tags,
+		"taints":                         flattenContainerAwsNodePoolConfigTaintsArray(obj.Taints),
 	}
 
 	return []interface{}{transformed}
@@ -779,6 +807,34 @@ func flattenContainerAwsNodePoolConfigConfigEncryption(obj *containeraws.NodePoo
 
 }
 
+func expandContainerAwsNodePoolConfigAutoscalingMetricsCollection(o interface{}) *containeraws.NodePoolConfigAutoscalingMetricsCollection {
+	if o == nil {
+		return containeraws.EmptyNodePoolConfigAutoscalingMetricsCollection
+	}
+	objArr := o.([]interface{})
+	if len(objArr) == 0 || objArr[0] == nil {
+		return containeraws.EmptyNodePoolConfigAutoscalingMetricsCollection
+	}
+	obj := objArr[0].(map[string]interface{})
+	return &containeraws.NodePoolConfigAutoscalingMetricsCollection{
+		Granularity: dcl.String(obj["granularity"].(string)),
+		Metrics:     expandStringArray(obj["metrics"]),
+	}
+}
+
+func flattenContainerAwsNodePoolConfigAutoscalingMetricsCollection(obj *containeraws.NodePoolConfigAutoscalingMetricsCollection) interface{} {
+	if obj == nil || obj.Empty() {
+		return nil
+	}
+	transformed := map[string]interface{}{
+		"granularity": obj.Granularity,
+		"metrics":     obj.Metrics,
+	}
+
+	return []interface{}{transformed}
+
+}
+
 func expandContainerAwsNodePoolConfigInstancePlacement(o interface{}) *containeraws.NodePoolConfigInstancePlacement {
 	if o == nil {
 		return nil

website/docs/r/container_aws_node_pool.html.markdown

@@ -232,6 +232,10 @@ The `autoscaling` block supports:
 
 The `config` block supports:
 
+* `autoscaling_metrics_collection` -
+  (Optional)
+  Optional. Configuration related to CloudWatch metrics collection on the Auto Scaling group of the node pool. When unspecified, metrics collection is disabled.
+    
 * `config_encryption` -
   (Required)
   The ARN of the AWS KMS key used to encrypt node pool configuration.
@@ -304,6 +308,16 @@ The `max_pods_constraint` block supports:
 
 
 
+The `autoscaling_metrics_collection` block supports:
+    
+* `granularity` -
+  (Required)
+  The frequency at which EC2 Auto Scaling sends aggregated data to AWS CloudWatch. The only valid value is "1Minute".
+    
+* `metrics` -
+  (Optional)
+  The metrics to enable. For a list of valid metrics, see https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_EnableMetricsCollection.html. If you specify granularity and don't specify any metrics, all metrics are enabled.
+    
 The `instance_placement` block supports:
 
 * `tenancy` -