Fixing based on PR comments

Author: NA2047

mmv1/products/memorystore/Instance.yaml

@@ -398,11 +398,6 @@ properties:
           description:
             "Service attachment URI which your self-created PscConnection should use as target."
           output: true
-        - name: 'dnsName'
-          type: String
-          description:
-            "The PSC endpoint IP address"
-          output: true
         - name: 'connectionType'
           type: String
           description:

mmv1/products/memorystore/InstanceDesiredUserCreatedConnections.yaml renamed to mmv1/products/memorystore/InstanceDesiredUserCreatedEndpoints.yaml

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 ---
-name: 'InstanceDesiredUserCreatedConnections'
-api_resource_type_kind: Cluster
+name: 'InstanceDesiredUserCreatedEndpoints'
+api_resource_type_kind: Instance
 description: |
   Manages user created connections for Memorystore instance
 docs:
@@ -35,7 +35,7 @@ update_verb: 'PATCH'
 update_url: 'projects/{{project}}/locations/{{region}}/instances/{{name}}?updateMask=endpoints'
 update_mask: true
 custom_code:
-  custom_delete: 'templates/terraform/custom_delete/memorystore_instance_desired_user_created_connections.go.tmpl'
+  custom_delete: 'templates/terraform/custom_delete/memorystore_instance_desired_user_created_endpoints.go.tmpl'
 timeouts:
   insert_minutes: 60
   update_minutes: 120
@@ -49,7 +49,7 @@ async:
   result:
     resource_inside_response: false
 examples:
-  - name: 'memorystore_instance_desired_user_created_connections'
+  - name: 'memorystore_instance_desired_user_created_endpoints'
     primary_resource_id: 'instance-user-conn'
     vars:
       instance_name: 'instance-user-conn'
@@ -65,7 +65,7 @@ examples:
       ip2_network2_name: 'ip2-net2'
       forwarding_rule1_network2_name: 'fwd1-net2'
       forwarding_rule2_network2_name: 'fwd2-net2'
-  - name: 'memorystore_instance_desired_user_and_auto_created_connections'
+  - name: 'memorystore_instance_desired_user_and_auto_created_endpoints'
     primary_resource_id: 'instance-user-auto-conn'
     vars:
       instance_name: 'instance-user-auto-conn'
@@ -92,10 +92,10 @@ parameters:
     url_param_only: true
     required: true
 properties:
-  - name: 'desiredUserEndpoints'
+  - name: 'desiredUserCreatedEndpoints'
     api_name: 'endpoints'
     type: Array
-    description: "A list of instance endpoints"
+    description: "A list of desired user endpoints"
     custom_flatten: 'templates/terraform/custom_flatten/memorystore_instance_desired_user_created_connections_desired_endpoints.go.tmpl'
     item_type:
       type: NestedObject

mmv1/templates/terraform/custom_delete/memorystore_instance_desired_user_created_connections.go.tmpl renamed to mmv1/templates/terraform/custom_delete/memorystore_instance_desired_user_created_endpoints.go.tmpl

@@ -7,7 +7,7 @@
 	billingProject = project
 
 	obj := make(map[string]interface{})
-    // not setting instanceEndpoints in obj
+    // not setting desiredUserCreatedEndpoints in obj
 
 
 	url, err := tpgresource.ReplaceVars(d, config, "{{"{{"}}MemorystoreBasePath{{"}}"}}projects/{{"{{"}}project{{"}}"}}/locations/{{"{{"}}region{{"}}"}}/instances/{{"{{"}}name{{"}}"}}")
@@ -20,6 +20,7 @@
 
 	updateMask := []string{}
 	updateMask = append(updateMask, "endpoints")
+	// endpoints maps to desiredUserCreatedEndpoints on the resource
 	// updateMask is a URL parameter but not present in the schema, so ReplaceVars
 	// won't set it
 	url, err = transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})
@@ -61,4 +62,4 @@
 			return err
 		}
 	}
-	return resourceMemorystoreInstanceDesiredUserCreatedConnectionsRead(d, meta)
+	return resourceMemorystoreInstanceDesiredUserCreatedEndpointsRead(d, meta)

mmv1/templates/terraform/examples/memorystore_instance_desired_user_and_auto_created_connections.tf.tmpl renamed to mmv1/templates/terraform/examples/memorystore_instance_desired_user_and_auto_created_endpoints.tf.tmpl

@@ -1,7 +1,7 @@
-resource "google_memorystore_instance_desired_user_created_connections" "{{$.PrimaryResourceId}}" {
+resource "google_memorystore_instance_desired_user_created_endpoints" "{{$.PrimaryResourceId}}" {
   name                        = "{{index $.Vars "instance_name"}}"
   region                      = "us-central1"
-  desired_user_endpoints {
+  desired_user_created_endpoints {
     connections {
       psc_connection {
         psc_connection_id     = google_compute_forwarding_rule.forwarding_rule1_network2.psc_connection_id

mmv1/templates/terraform/examples/memorystore_instance_desired_user_created_connections.tf.tmpl renamed to mmv1/templates/terraform/examples/memorystore_instance_desired_user_created_endpoints.tf.tmpl

@@ -1,7 +1,7 @@
-resource "google_memorystore_instance_desired_user_created_connections" "{{$.PrimaryResourceId}}" {
+resource "google_memorystore_instance_desired_user_created_endpoints" "{{$.PrimaryResourceId}}" {
   name                        = "{{index $.Vars "instance_name"}}"
   region                      = "us-central1"
-  desired_user_endpoints {
+  desired_user_created_endpoints {
     connections {
       psc_connection {
         psc_connection_id     = google_compute_forwarding_rule.forwarding_rule1_network2.psc_connection_id
@@ -21,7 +21,7 @@ resource "google_memorystore_instance_desired_user_created_connections" "{{$.Pri
       }
     }
   }
-  desired_user_endpoints {
+  desired_user_created_endpoints {
     connections {
       psc_connection {
         psc_connection_id     = google_compute_forwarding_rule.forwarding_rule1_network2.psc_connection_id

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

@@ -352,11 +352,11 @@ type InstanceParams struct {
 
 func createMemorystoreInstanceEndpointsWithOneUserCreatedConnections(params *InstanceParams) string {
 	return fmt.Sprintf(`
-		resource "google_memorystore_instance_desired_user_created_connections" "default" {
+		resource "google_memorystore_instance_desired_user_created_endpoints" "default" {
 
 		name                           = "%s"
 		region                         = "europe-west1"
-		desired_user_endpoints {
+		desired_user_created_endpoints {
 			connections {
 				psc_connection {
 					psc_connection_id  = google_compute_forwarding_rule.forwarding_rule1_network1.psc_connection_id
@@ -367,7 +367,7 @@ func createMemorystoreInstanceEndpointsWithOneUserCreatedConnections(params *Ins
 					service_attachment = google_memorystore_instance.test.psc_attachment_details[0].service_attachment
 				}
 			}
-		desired_user_endpoints {
+		desired_user_created_endpoints {
 				psc_connection {
 					psc_connection_id  = google_compute_forwarding_rule.forwarding_rule2_network1.psc_connection_id
 					ip_address         = google_compute_address.ip2_network1.address
@@ -388,10 +388,10 @@ func createMemorystoreInstanceEndpointsWithOneUserCreatedConnections(params *Ins
 
 func createMemorystoreInstanceEndpointsWithTwoUserCreatedConnections(params *InstanceParams) string {
 	return fmt.Sprintf(`
-		resource "google_memorystore_instance_desired_user_created_connections" "default" {
+		resource "google_memorystore_instance_desired_user_created_endpoints" "default" {
 		name                           = "%s"
 		region                         = "europe-west1"
-		desired_user_endpoints {
+		desired_user_created_endpoints {
 			connections {
 				psc_connection {
 					psc_connection_id  = google_compute_forwarding_rule.forwarding_rule1_network1.psc_connection_id
@@ -412,7 +412,7 @@ func createMemorystoreInstanceEndpointsWithTwoUserCreatedConnections(params *Ins
 				}
 			}
 		}
-		desired_user_endpoints {
+		desired_user_created_endpoints {
 			connections {
 				psc_connection {
 					psc_connection_id  = google_compute_forwarding_rule.forwarding_rule1_network2.psc_connection_id