Memorystore Valkey Multi vpc support (#13355) (#9652)

[upstream:a89d9534c8d63aad647030a54bc7fd62dd5935bd]

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

Author: modular-magician

.changelog/13355.txt

@@ -0,0 +1,6 @@
+```release-note:new-resource
+`google_memorystore_instance_desired_user_created_connections`
+```
+```release-note:enhancement
+memorystore: added `psc_attachment_details` field to `google_memorystore_instance` resource, to enable use of the fine-grained resource `google_memorystore_instance_desired_user_created_connections
+```

google-beta/provider/provider_mmv1_resources.go

@@ -554,9 +554,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
 }
 
 // Resources
-// Generated resources: 633
+// Generated resources: 634
 // Generated IAM resources: 312
-// Total generated resources: 945
+// Total generated resources: 946
 var generatedResources = map[string]*schema.Resource{
 	"google_folder_access_approval_settings":                                     accessapproval.ResourceAccessApprovalFolderSettings(),
 	"google_organization_access_approval_settings":                               accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -1220,6 +1220,7 @@ var generatedResources = map[string]*schema.Resource{
 	"google_managed_kafka_topic":                                                 managedkafka.ResourceManagedKafkaTopic(),
 	"google_memcache_instance":                                                   memcache.ResourceMemcacheInstance(),
 	"google_memorystore_instance":                                                memorystore.ResourceMemorystoreInstance(),
+	"google_memorystore_instance_desired_user_created_endpoints":                 memorystore.ResourceMemorystoreInstanceDesiredUserCreatedEndpoints(),
 	"google_migration_center_group":                                              migrationcenter.ResourceMigrationCenterGroup(),
 	"google_migration_center_preference_set":                                     migrationcenter.ResourceMigrationCenterPreferenceSet(),
 	"google_ml_engine_model":                                                     mlengine.ResourceMLEngineModel(),

google-beta/services/memorystore/resource_memorystore_instance.go

@@ -520,6 +520,25 @@ Format: projects/{project}/locations/{location}/instances/{instance}`,
 					},
 				},
 			},
+			"psc_attachment_details": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: `Configuration of a service attachment of the cluster, for creating PSC connections.`,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"connection_type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: `Service attachment URI which your self-created PscConnection should use as target.`,
+						},
+						"service_attachment": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: `Service attachment URI which your self-created PscConnection should use as target.`,
+						},
+					},
+				},
+			},
 			"psc_auto_connections": {
 				Type:        schema.TypeList,
 				Computed:    true,
@@ -607,6 +626,16 @@ DELETING`,
 							Description: `Represents information about instance with state UPDATING.`,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
+									"target_engine_version": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: `Output only. Target engine version for the instance.`,
+									},
+									"target_node_type": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: `Output only. Target node type for the instance.`,
+									},
 									"target_replica_count": {
 										Type:        schema.TypeInt,
 										Computed:    true,
@@ -642,9 +671,9 @@ DELETING`,
 			},
 			"desired_psc_auto_connections": {
 				Type:        schema.TypeList,
-				Required:    true,
+				Optional:    true,
 				ForceNew:    true,
-				Description: `Required. Immutable. User inputs for the auto-created PSC connections.`,
+				Description: `Immutable. User inputs for the auto-created PSC connections.`,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"network": {
@@ -966,6 +995,9 @@ func resourceMemorystoreInstanceRead(d *schema.ResourceData, meta interface{}) e
 	if err := d.Set("mode", flattenMemorystoreInstanceMode(res["mode"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Instance: %s", err)
 	}
+	if err := d.Set("psc_attachment_details", flattenMemorystoreInstancePscAttachmentDetails(res["pscAttachmentDetails"], d, config)); err != nil {
+		return fmt.Errorf("Error reading Instance: %s", err)
+	}
 	if err := d.Set("psc_auto_connections", flattenMemorystoreInstancePscAutoConnections(res["pscAutoConnections"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Instance: %s", err)
 	}
@@ -1277,6 +1309,10 @@ func flattenMemorystoreInstanceStateInfoUpdateInfo(v interface{}, d *schema.Reso
 		flattenMemorystoreInstanceStateInfoUpdateInfoTargetShardCount(original["targetShardCount"], d, config)
 	transformed["target_replica_count"] =
 		flattenMemorystoreInstanceStateInfoUpdateInfoTargetReplicaCount(original["targetReplicaCount"], d, config)
+	transformed["target_engine_version"] =
+		flattenMemorystoreInstanceStateInfoUpdateInfoTargetEngineVersion(original["targetEngineVersion"], d, config)
+	transformed["target_node_type"] =
+		flattenMemorystoreInstanceStateInfoUpdateInfoTargetNodeType(original["targetNodeType"], d, config)
 	return []interface{}{transformed}
 }
 func flattenMemorystoreInstanceStateInfoUpdateInfoTargetShardCount(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
@@ -1313,6 +1349,14 @@ func flattenMemorystoreInstanceStateInfoUpdateInfoTargetReplicaCount(v interface
 	return v // let terraform core handle it otherwise
 }
 
+func flattenMemorystoreInstanceStateInfoUpdateInfoTargetEngineVersion(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenMemorystoreInstanceStateInfoUpdateInfoTargetNodeType(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenMemorystoreInstanceUid(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -1799,6 +1843,33 @@ func flattenMemorystoreInstanceMode(v interface{}, d *schema.ResourceData, confi
 	return v
 }
 
+func flattenMemorystoreInstancePscAttachmentDetails(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return v
+	}
+	l := v.([]interface{})
+	transformed := make([]interface{}, 0, len(l))
+	for _, raw := range l {
+		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
+		transformed = append(transformed, map[string]interface{}{
+			"service_attachment": flattenMemorystoreInstancePscAttachmentDetailsServiceAttachment(original["serviceAttachment"], d, config),
+			"connection_type":    flattenMemorystoreInstancePscAttachmentDetailsConnectionType(original["connectionType"], d, config),
+		})
+	}
+	return transformed
+}
+func flattenMemorystoreInstancePscAttachmentDetailsServiceAttachment(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenMemorystoreInstancePscAttachmentDetailsConnectionType(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenMemorystoreInstancePscAutoConnections(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
@@ -2258,7 +2329,7 @@ func resourceMemorystoreInstanceDecoder(d *schema.ResourceData, meta interface{}
 		if _, endpointsFound := res["endpoints"]; endpointsFound {
 			return res, nil // For Cluster Disabled instances, we would have 'endpoints' instead of 'pscAutoConnections'
 		}
-		return nil, fmt.Errorf("pscAutoConnections field not found in API response")
+		return res, nil
 	}
 
 	connections, ok := v.([]interface{})