Skip to content

Commit 92976e3

Browse files
committed
fixed yamllit
1 parent 7440843 commit 92976e3

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

mmv1/products/memorystore/Instance.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ description: A Google Cloud Memorystore instance.
1717
docs:
1818
references:
1919
guides:
20-
'Official Documentation': https://cloud.google.com/memorystore/docs/valkey/create-instances
20+
'Official Documentation': https://cloud.google.com/memorystore/docs/valkey/create-instances
2121
api: 'https://cloud.google.com/memorystore/docs/valkey/reference/rest/v1/projects.locations.instances'
2222
id_format: 'projects/{{project}}/locations/{{location}}/instances/{{instance_id}}'
2323
base_url: 'projects/{{project}}/locations/{{location}}/instances'
@@ -161,7 +161,7 @@ properties:
161161
output: true
162162
- name: 'targetEngineVersion'
163163
type: String
164-
description:
164+
description:
165165
"Output only. Target engine version for the instance."
166166
output: true
167167
- name: 'targetNodeType'
@@ -388,8 +388,8 @@ properties:
388388
- 'CLUSTER_DISABLED'
389389
- name: 'pscAttachmentDetails'
390390
type: Array
391-
description:
392-
"Configuration of a service attachment of the cluster, for creating PSC connections."
391+
description:
392+
"Configuration of a service attachment of the cluster, for creating PSC connections."
393393
output: true
394394
item_type:
395395
type: NestedObject

mmv1/products/memorystore/InstanceDesiredUserCreatedConnections.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,11 @@ parameters:
9292
url_param_only: true
9393
required: true
9494
properties:
95-
- name: 'instanceEndpoints'
95+
- name: 'desiredUserEndpoints'
96+
api_name: 'endpoints'
9697
type: Array
9798
description: "A list of instance endpoints"
99+
custom_flatten: 'templates/terraform/custom_flatten/memorystore_instance_desired_user_created_connections_desired_endpoints.go.tmpl'
98100
item_type:
99101
type: NestedObject
100102
description: |
@@ -120,7 +122,7 @@ properties:
120122
"The PSC connection id of the forwarding rule connected
121123
to the\nservice attachment."
122124
required: true
123-
- name: 'address'
125+
- name: 'ipAddress'
124126
type: String
125127
description:
126128
"The IP allocated on the consumer network for the

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,11 @@ func createOrUpdateMemorystoreInstance(params *InstanceParams) string {
594594
`, params.persistenceMode)
595595
}
596596

597-
endpointBlock := createMemorystoreInstanceEndpoints(params)
597+
if params.userEndpointCount == 2 {
598+
createMemorystoreInstanceEndpointsWithTwoUserCreatedConnections(params)
599+
} else if params.userEndpointCount == 1 {
600+
createMemorystoreInstanceEndpointsWithOneUserCreatedConnections(params)
601+
}
598602

599603
return fmt.Sprintf(`
600604
resource "google_memorystore_instance" "test" {
@@ -645,5 +649,5 @@ resource "google_compute_network" "producer_net" {
645649
646650
data "google_project" "project" {
647651
}
648-
`, endpointBlock, params.name, params.replicaCount, params.shardCount, params.nodeType, params.deletionProtectionEnabled, params.engineVersion, strBuilder.String(), zoneDistributionConfigBlock, persistenceBlock, lifecycleBlock, params.name, params.name, params.name)
652+
`, params.name, params.replicaCount, params.shardCount, params.nodeType, params.deletionProtectionEnabled, params.engineVersion, strBuilder.String(), zoneDistributionConfigBlock, persistenceBlock, lifecycleBlock, params.name, params.name, params.name)
649653
}

0 commit comments

Comments
 (0)