upgraded dcl (#6124) (#11892)

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

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

Author: modular-magician

.changelog/6124.txt

@@ -0,0 +1,6 @@
+```release-note:enhancement
+compute: added `psc_connection_id` and `psc_connection_status` output fields to `google_compute_forwarding_rule` and `google_compute_global_forwarding_rule` resources
+```
+```release-note:enhancement
+containeraws: made `config.instance_type` field updatable in `google_container_aws_node_pool`
+```

go.mod

@@ -1,7 +1,7 @@
 module github.com/hashicorp/terraform-provider-google
 require (
 	cloud.google.com/go/bigtable v1.13.0
-	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.10.0
+	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.10.3
 	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

@@ -1511,3 +1511,5 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.10.3 h1:DsRf9bbXlHZVSWosvXwFLvtWdNTvIK/Ssbf8JWnrb/o=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.10.3/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=

google/resource_compute_forwarding_rule.go

@@ -218,6 +218,18 @@ func resourceComputeForwardingRule() *schema.Resource {
 				Description: "Used internally during label updates.",
 			},
 
+			"psc_connection_id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The PSC connection id of the PSC Forwarding Rule.",
+			},
+
+			"psc_connection_status": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The PSC connection status of the PSC Forwarding Rule. Possible values: STATUS_UNSPECIFIED, PENDING, ACCEPTED, REJECTED, CLOSED",
+			},
+
 			"self_link": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -447,6 +459,12 @@ func resourceComputeForwardingRuleRead(d *schema.ResourceData, meta interface{})
 	if err = d.Set("label_fingerprint", res.LabelFingerprint); err != nil {
 		return fmt.Errorf("error setting label_fingerprint in state: %s", err)
 	}
+	if err = d.Set("psc_connection_id", res.PscConnectionId); err != nil {
+		return fmt.Errorf("error setting psc_connection_id in state: %s", err)
+	}
+	if err = d.Set("psc_connection_status", res.PscConnectionStatus); err != nil {
+		return fmt.Errorf("error setting psc_connection_status in state: %s", err)
+	}
 	if err = d.Set("self_link", res.SelfLink); err != nil {
 		return fmt.Errorf("error setting self_link in state: %s", err)
 	}

google/resource_compute_global_forwarding_rule.go

@@ -146,6 +146,18 @@ func resourceComputeGlobalForwardingRule() *schema.Resource {
 				Description: "Used internally during label updates.",
 			},
 
+			"psc_connection_id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The PSC connection id of the PSC Forwarding Rule.",
+			},
+
+			"psc_connection_status": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The PSC connection status of the PSC Forwarding Rule. Possible values: STATUS_UNSPECIFIED, PENDING, ACCEPTED, REJECTED, CLOSED",
+			},
+
 			"self_link": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -340,6 +352,12 @@ func resourceComputeGlobalForwardingRuleRead(d *schema.ResourceData, meta interf
 	if err = d.Set("label_fingerprint", res.LabelFingerprint); err != nil {
 		return fmt.Errorf("error setting label_fingerprint in state: %s", err)
 	}
+	if err = d.Set("psc_connection_id", res.PscConnectionId); err != nil {
+		return fmt.Errorf("error setting psc_connection_id in state: %s", err)
+	}
+	if err = d.Set("psc_connection_status", res.PscConnectionStatus); err != nil {
+		return fmt.Errorf("error setting psc_connection_status in state: %s", err)
+	}
 	if err = d.Set("self_link", res.SelfLink); err != nil {
 		return fmt.Errorf("error setting self_link in state: %s", err)
 	}

google/resource_container_aws_node_pool.go

@@ -200,7 +200,6 @@ func ContainerAwsNodePoolConfigSchema() *schema.Resource {
 				Type:        schema.TypeString,
 				Computed:    true,
 				Optional:    true,
-				ForceNew:    true,
 				Description: "Optional. The AWS instance type. When unspecified, it defaults to `m5.large`.",
 			},
 

google/resource_container_aws_node_pool_generated_test.go

@@ -328,7 +328,7 @@ resource "google_container_aws_node_pool" "primary" {
     }
 
     iam_instance_profile = "%{byo_prefix}-1p-dev-nodepool"
-    instance_type        = "t3.medium"
+    instance_type        = "t3.large"
 
     labels = {
       label-one = "value-one"

website/docs/r/compute_forwarding_rule.html.markdown

@@ -1208,6 +1208,12 @@ In addition to the arguments listed above, the following computed attributes are
 * `creation_timestamp` -
   Creation timestamp in RFC3339 text format.
 
+* `psc_connection_id` -
+  The PSC connection id of the PSC Forwarding Rule.
+
+* `psc_connection_status` -
+  The PSC connection status of the PSC Forwarding Rule. Possible values: STATUS_UNSPECIFIED, PENDING, ACCEPTED, REJECTED, CLOSED
+
 * `label_fingerprint` -
   ([Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
   The fingerprint used for optimistic locking of this resource.  Used