Skip to content

Commit 77647bc

Browse files
modular-magicianScottSuarez
authored andcommitted
Adding output only field to Memorystore and Redis Cluster (#15419) (#10899)
[upstream:03e521bc5e2f6da7d7bcd458614d74808bc1cf97] Signed-off-by: Modular Magician <[email protected]>
1 parent 409fb97 commit 77647bc

File tree

7 files changed

+45
-0
lines changed

7 files changed

+45
-0
lines changed

.changelog/15419.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:enhancement
2+
compute: added `available_maintenance_versions` field to `google_redis_cluster` resource
3+
```
4+
5+
```release-note:enhancement
6+
memorystore: added `available_maintenance_versions` field to `google_memorystore_instance` resource
7+
```

google-beta/services/memorystore/resource_memorystore_instance.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,14 @@ Ignored for MULTI_ZONE mode.`,
564564
},
565565
},
566566
},
567+
"available_maintenance_versions": {
568+
Type: schema.TypeList,
569+
Computed: true,
570+
Description: `This field is used to determine the available maintenance versions for the self service update.`,
571+
Elem: &schema.Schema{
572+
Type: schema.TypeString,
573+
},
574+
},
567575
"backup_collection": {
568576
Type: schema.TypeString,
569577
Computed: true,
@@ -1268,6 +1276,9 @@ func resourceMemorystoreInstanceRead(d *schema.ResourceData, meta interface{}) e
12681276
if err := d.Set("effective_maintenance_version", flattenMemorystoreInstanceEffectiveMaintenanceVersion(res["effectiveMaintenanceVersion"], d, config)); err != nil {
12691277
return fmt.Errorf("Error reading Instance: %s", err)
12701278
}
1279+
if err := d.Set("available_maintenance_versions", flattenMemorystoreInstanceAvailableMaintenanceVersions(res["availableMaintenanceVersions"], d, config)); err != nil {
1280+
return fmt.Errorf("Error reading Instance: %s", err)
1281+
}
12711282
if err := d.Set("engine_version", flattenMemorystoreInstanceEngineVersion(res["engineVersion"], d, config)); err != nil {
12721283
return fmt.Errorf("Error reading Instance: %s", err)
12731284
}
@@ -2094,6 +2105,10 @@ func flattenMemorystoreInstanceEffectiveMaintenanceVersion(v interface{}, d *sch
20942105
return v
20952106
}
20962107

2108+
func flattenMemorystoreInstanceAvailableMaintenanceVersions(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2109+
return v
2110+
}
2111+
20972112
func flattenMemorystoreInstanceEngineVersion(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
20982113
return v
20992114
}

google-beta/services/memorystore/resource_memorystore_instance_generated_meta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ fields:
99
- api_field: 'authorizationMode'
1010
- api_field: 'automatedBackupConfig.fixedFrequencySchedule.startTime.hours'
1111
- api_field: 'automatedBackupConfig.retention'
12+
- api_field: 'availableMaintenanceVersions'
1213
- api_field: 'backupCollection'
1314
- api_field: 'createTime'
1415
- api_field: 'crossInstanceReplicationConfig.instanceRole'

google-beta/services/redis/resource_redis_cluster.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,14 @@ If not provided, MULTI_ZONE will be used as default Possible values: ["MULTI_ZON
548548
},
549549
},
550550
},
551+
"available_maintenance_versions": {
552+
Type: schema.TypeList,
553+
Computed: true,
554+
Description: `This field is used to determine the available maintenance versions for the self service update.`,
555+
Elem: &schema.Schema{
556+
Type: schema.TypeString,
557+
},
558+
},
551559
"backup_collection": {
552560
Type: schema.TypeString,
553561
Computed: true,
@@ -1078,6 +1086,9 @@ func resourceRedisClusterRead(d *schema.ResourceData, meta interface{}) error {
10781086
if err := d.Set("effective_maintenance_version", flattenRedisClusterEffectiveMaintenanceVersion(res["effectiveMaintenanceVersion"], d, config)); err != nil {
10791087
return fmt.Errorf("Error reading Cluster: %s", err)
10801088
}
1089+
if err := d.Set("available_maintenance_versions", flattenRedisClusterAvailableMaintenanceVersions(res["availableMaintenanceVersions"], d, config)); err != nil {
1090+
return fmt.Errorf("Error reading Cluster: %s", err)
1091+
}
10811092
if err := d.Set("cross_cluster_replication_config", flattenRedisClusterCrossClusterReplicationConfig(res["crossClusterReplicationConfig"], d, config)); err != nil {
10821093
return fmt.Errorf("Error reading Cluster: %s", err)
10831094
}
@@ -1941,6 +1952,10 @@ func flattenRedisClusterEffectiveMaintenanceVersion(v interface{}, d *schema.Res
19411952
return v
19421953
}
19431954

1955+
func flattenRedisClusterAvailableMaintenanceVersions(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1956+
return v
1957+
}
1958+
19441959
func flattenRedisClusterCrossClusterReplicationConfig(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
19451960
if v == nil {
19461961
return nil

google-beta/services/redis/resource_redis_cluster_generated_meta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ fields:
88
- api_field: 'authorizationMode'
99
- api_field: 'automatedBackupConfig.fixedFrequencySchedule.startTime.hours'
1010
- api_field: 'automatedBackupConfig.retention'
11+
- api_field: 'availableMaintenanceVersions'
1112
- api_field: 'backupCollection'
1213
- api_field: 'createTime'
1314
- api_field: 'crossClusterReplicationConfig.clusterRole'

website/docs/r/memorystore_instance.html.markdown

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,9 @@ In addition to the arguments listed above, the following computed attributes are
816816
* `effective_maintenance_version` -
817817
This field represents the actual maintenance version of the cluster.
818818

819+
* `available_maintenance_versions` -
820+
This field is used to determine the available maintenance versions for the self service update.
821+
819822
* `node_config` -
820823
Represents configuration for nodes of the instance.
821824
Structure is [documented below](#nested_node_config).

website/docs/r/redis_cluster.html.markdown

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,9 @@ In addition to the arguments listed above, the following computed attributes are
10151015
* `effective_maintenance_version` -
10161016
This field represents the actual maintenance version of the cluster.
10171017

1018+
* `available_maintenance_versions` -
1019+
This field is used to determine the available maintenance versions for the self service update.
1020+
10181021
* `psc_service_attachments` -
10191022
Service attachment details to configure Psc connections.
10201023
Structure is [documented below](#nested_psc_service_attachments).

0 commit comments

Comments
 (0)