Merge branch 'main' of https://github.com/GoogleCloudPlatform/magic-modules

Author: actions-user

…te/resource_compute_rollout_plan_test.go …source_compute_rollout_plan_test.go.tmplmmv1/third_party/terraform/services/compute/resource_compute_rollout_plan_test.go renamed to mmv1/third_party/terraform/services/compute/resource_compute_rollout_plan_test.go.tmpl mmv1/third_party/terraform/services/compute/resource_compute_rollout_plan_test.go renamed to mmv1/third_party/terraform/services/compute/resource_compute_rollout_plan_test.go.tmpl

@@ -1,5 +1,7 @@
 package compute_test
 
+{{- if ne $.TargetVersionName "ga" }}
+
 import (
 	"fmt"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -127,3 +129,5 @@ resource "google_compute_rollout_plan" "complex" {
 }
 `, context["random_suffix"])
 }
+
+{{- end }}

mmv1/third_party/terraform/services/container/resource_container_cluster.go.tmpl

@@ -2361,8 +2361,9 @@ func ResourceContainerCluster() *schema.Resource {
             "state": {
               Type:         schema.TypeString,
               Required:     true,
-              ValidateFunc: validation.StringInSlice([]string{"ENCRYPTED", "DECRYPTED"}, false),
-              Description:  `ENCRYPTED or DECRYPTED.`,
+              ValidateFunc: validation.StringInSlice([]string{"ENCRYPTED", "ALL_OBJECTS_ENCRYPTION_ENABLED", "DECRYPTED"}, false),
+              Description:  `ENCRYPTED, ALL_OBJECTS_ENCRYPTION_ENABLED or DECRYPTED.`,
+              DiffSuppressFunc: DatabaseEncryptionSuppress,
             },
             "key_name": {
               Type:        schema.TypeString,
@@ -8832,6 +8833,18 @@ func SecretManagerCfgSuppress(k, old, new string, r *schema.ResourceData) bool {
 	return false
 }
 
+func DatabaseEncryptionSuppress(k, old, new string, d *schema.ResourceData) bool {
+	// The API sometimes returns ALL_OBJECTS_ENCRYPTION_ENABLED when the user sets ENCRYPTED
+	// and vice versa (depending on the cluster version and underlying resource storage).
+	if old == "ALL_OBJECTS_ENCRYPTION_ENABLED" && new == "ENCRYPTED" {
+		return true
+	}
+	if old == "ENCRYPTED" && new == "ALL_OBJECTS_ENCRYPTION_ENABLED" {
+                return true
+	}
+        return false
+}
+
 {{ if ne $.TargetVersionName `ga` -}}
 func SecretSyncCfgSuppress(k, old, new string, r *schema.ResourceData) bool {
 	if k == "secret_sync_config.#" && old == "1" && new == "0" {