Adding maintenance_version to Redis cluster and Memorystore Instance (#15387)

Author: NA2047

mmv1/products/memorystore/Instance.yaml

@@ -480,6 +480,16 @@ properties:
           A timestamp in RFC3339 UTC "Zulu" format, with nanosecond
           resolution and up to nine fractional digits.
         output: true
+  - name: 'maintenanceVersion'
+    type: String
+    description: |
+      This field can be used to trigger self service update to indicate the desired maintenance version. The input to this field can be determined by the available_maintenance_versions field.
+      *Note*: This field can only be specified when updating an existing cluster to a newer version. Downgrades are currently not supported!
+  - name: 'effectiveMaintenanceVersion'
+    type: String
+    description: |
+      This field represents the actual maintenance version of the cluster.
+    output: true
   - name: 'engineVersion'
     type: String
     description: "Optional. Engine version of the instance."

mmv1/products/redis/Cluster.yaml

@@ -689,6 +689,16 @@ properties:
           A timestamp in RFC3339 UTC "Zulu" format, with nanosecond
           resolution and up to nine fractional digits.
         output: true
+  - name: 'maintenanceVersion'
+    type: String
+    description: |
+      This field can be used to trigger self service update to indicate the desired maintenance version. The input to this field can be determined by the available_maintenance_versions field.
+      *Note*: This field can only be specified when updating an existing cluster to a newer version. Downgrades are currently not supported!
+  - name: 'effectiveMaintenanceVersion'
+    type: String
+    description: |
+      This field represents the actual maintenance version of the cluster.
+    output: true
   - name: 'crossClusterReplicationConfig'
     type: NestedObject
     description: Cross cluster replication config

mmv1/templates/terraform/examples/memorystore_instance_full.tf.tmpl

@@ -75,4 +75,4 @@ resource "google_compute_network" "producer_net" {
 }
 
 data "google_project" "project" {
-}
+}

mmv1/third_party/terraform/services/memorystore/resource_memorystore_instance_test.go

@@ -1770,3 +1770,64 @@ data "google_project" "project" {
 }
 `, context)
 }
+
+func TestAccMemorystoreInstance_memorystoreInstanceMaintenanceVersion(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+		"location":      "us-central1",
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckMemorystoreInstanceDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccMemorystoreInstance_memorystoreInstanceMaintenanceVersionDeploy(context),
+			},
+			{
+				ResourceName:      "google_memorystore_instance.instance-ms",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccMemorystoreInstance_memorystoreInstanceMaintenanceVersionUpdate(context),
+			},
+			{
+				ResourceName:      "google_memorystore_instance.instance-ms",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testAccMemorystoreInstance_memorystoreInstanceMaintenanceVersionDeploy(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_memorystore_instance" "instance-ms" {
+  instance_id 					= "tf-test-ms-instance%{random_suffix}"
+  shard_count 					= 1
+  location                    	= "%{location}"
+  node_type                     = "SHARED_CORE_NANO"
+  deletion_protection_enabled 	= false
+  transit_encryption_mode 		= "SERVER_AUTHENTICATION"
+}
+
+`, context)
+}
+
+func testAccMemorystoreInstance_memorystoreInstanceMaintenanceVersionUpdate(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_memorystore_instance" "instance-ms" {
+  instance_id 					= "tf-test-ms-instance%{random_suffix}"
+  shard_count 					= 1
+  location                   	= "%{location}"
+  node_type                     = "SHARED_CORE_NANO"
+  deletion_protection_enabled 	= false
+  # maintenance_version 			= "MEMORYSTORE_20241206_00_00"
+  transit_encryption_mode 		= "SERVER_AUTHENTICATION"
+}
+`, context)
+}

mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go

@@ -1341,3 +1341,80 @@ resource "google_compute_network" "consumer_net" {
 }
 `, context)
 }
+
+func TestAccRedisCluster_redisClusterMaintenanceVersion(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+		"location":      "us-central1",
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckRedisClusterDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccRedisCluster_redisClusterMaintenanceVersionDeploy(context),
+			},
+			{
+				ResourceName:      "google_redis_cluster.cluster-ms",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccRedisCluster_redisClusterMaintenanceVersionUpdate(context),
+			},
+			{
+				ResourceName:      "google_redis_cluster.cluster-ms",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testAccRedisCluster_redisClusterMaintenanceVersionDeploy(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_redis_cluster" "cluster-ms" {
+  name           			 = "tf-test-ms-cluster%{random_suffix}"
+  shard_count    			 = 1
+  region 					 = "%{location}"
+  replica_count				 = 1
+  node_type 				 = "REDIS_SHARED_CORE_NANO"
+  transit_encryption_mode 	 = "TRANSIT_ENCRYPTION_MODE_SERVER_AUTHENTICATION"
+  authorization_mode 		 = "AUTH_MODE_DISABLED"
+  redis_configs = { 
+    maxmemory-policy		 = "volatile-ttl"
+  }
+  deletion_protection_enabled = false
+
+  zone_distribution_config {
+    mode 					 = "MULTI_ZONE"
+  }
+}
+`, context)
+}
+
+func testAccRedisCluster_redisClusterMaintenanceVersionUpdate(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_redis_cluster" "cluster-ms" {
+  name           			 = "tf-test-ms-cluster%{random_suffix}"
+  shard_count    			 = 1
+  region 					 = "%{location}"
+  replica_count				 = 1
+  node_type 				 = "REDIS_SHARED_CORE_NANO"
+  transit_encryption_mode 	 = "TRANSIT_ENCRYPTION_MODE_SERVER_AUTHENTICATION"
+  authorization_mode 		 = "AUTH_MODE_DISABLED"
+  # maintenance_version 		 = "REDISCLUSTER_20251008.00_p00"
+  redis_configs = { 
+    maxmemory-policy		 = "volatile-ttl"
+  }
+  deletion_protection_enabled = false
+  zone_distribution_config {
+    mode 					 = "MULTI_ZONE"
+  }
+}
+`, context)
+}