Skip to content

Commit 287e403

Browse files
committed
removed required field from desired_psc_auto_connections
1 parent 423b9a0 commit 287e403

6 files changed

+1
-304
lines changed

mmv1/products/memorystore/Instance.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ virtual_fields:
8080
PSC connections. "
8181
type: Array
8282
immutable: true
83-
required: true
8483
item_type:
8584
type: NestedObject
8685
properties:

mmv1/products/memorystore/InstanceDesiredUserCreatedConnections.yaml

-30
Original file line numberDiff line numberDiff line change
@@ -48,36 +48,6 @@ async:
4848
base_url: '{{op_id}}'
4949
result:
5050
resource_inside_response: false
51-
examples:
52-
- name: 'memorystore_instance_desired_user_created_connections'
53-
primary_resource_id: 'instance-user-conn'
54-
vars:
55-
cluster_name: 'instance-user-conn'
56-
network1_name: 'net1'
57-
subnet_network1_name: 'subnet-net1'
58-
ip1_network1_name: 'ip1-net1'
59-
ip2_network1_name: 'ip2-net1'
60-
forwarding_rule1_network1_name: 'fwd1-net1'
61-
forwarding_rule2_network1_name: 'fwd2-net1'
62-
network2_name: 'network2'
63-
subnet_network2_name: 'subnet-net2'
64-
ip1_network2_name: 'ip1-net2'
65-
ip2_network2_name: 'ip2-net2'
66-
forwarding_rule1_network2_name: 'fwd1-net2'
67-
forwarding_rule2_network2_name: 'fwd2-net2'
68-
- name: 'memorystore_instance_desired_user_and_auto_created_connections'
69-
primary_resource_id: 'instance-user-auto-conn'
70-
vars:
71-
cluster_name: 'instance-user-auto-conn'
72-
network1_name: 'net1'
73-
subnet_network1_name: 'subnet-net1'
74-
policy_name: 'scpolicy'
75-
network2_name: 'network2'
76-
subnet_network2_name: 'subnet-net2'
77-
ip1_network2_name: 'ip1-net2'
78-
ip2_network2_name: 'ip2-net2'
79-
forwarding_rule1_network2_name: 'fwd1-net2'
80-
forwarding_rule2_network2_name: 'fwd2-net2'
8151
parameters:
8252
- name: 'name'
8353
type: String

mmv1/templates/terraform/custom_delete/memorystore_instance_desired_user_created_connections.go.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
headers := make(http.Header)
2020

2121
updateMask := []string{}
22-
updateMask = append(updateMask, "instanceEndpoints")
22+
updateMask = append(updateMask, "endpoints")
2323
// updateMask is a URL parameter but not present in the schema, so ReplaceVars
2424
// won't set it
2525
url, err = transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})

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

-112
This file was deleted.

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

-152
This file was deleted.

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

-8
Original file line numberDiff line numberDiff line change
@@ -350,14 +350,6 @@ type InstanceParams struct {
350350
userEndpointCount int
351351
}
352352

353-
func createMemorystoreInstanceEndpoints(params *InstanceParams) string {
354-
if params.userEndpointCount == 2 {
355-
return createMemorystoreInstanceEndpointsWithTwoUserCreatedConnections(params)
356-
} else if params.userEndpointCount == 1 {
357-
return createMemorystoreInstanceEndpointsWithOneUserCreatedConnections(params)
358-
}
359-
return ``
360-
}
361353
func createMemorystoreInstanceEndpointsWithOneUserCreatedConnections(params *InstanceParams) string {
362354
return fmt.Sprintf(`
363355
resource "google_memorystore_instance_desired_user_created_connections" "default" {

0 commit comments

Comments
 (0)