From c6b22c11245b647d178f2036060bcf0125945839 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Wed, 18 Oct 2023 23:53:33 +0000 Subject: [PATCH] Allow replicaCount to be set to zero in the google_redis_cluster resource (#9297) * Use send_empty_value for replicaCount in Redis Cluster * Add generated test for redis cluster * Update the template file and remove the genereated file --------- Co-authored-by: Demitri Swan [upstream:79fe43c34c8968f8bad9bb24271fb28f66f0d5f8] Signed-off-by: Modular Magician --- .changelog/9297.txt | 5 +++++ google/services/redis/resource_redis_cluster.go | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changelog/9297.txt diff --git a/.changelog/9297.txt b/.changelog/9297.txt new file mode 100644 index 00000000000..2d75cbf0c1b --- /dev/null +++ b/.changelog/9297.txt @@ -0,0 +1,5 @@ +```release-note:bug + +redis: allowed `replica_count` to be set to zero in the `google_redis_cluster` resource + +``` diff --git a/google/services/redis/resource_redis_cluster.go b/google/services/redis/resource_redis_cluster.go index a1b5472e16b..d9cf7a4f8cf 100644 --- a/google/services/redis/resource_redis_cluster.go +++ b/google/services/redis/resource_redis_cluster.go @@ -279,7 +279,7 @@ func resourceRedisClusterCreate(d *schema.ResourceData, meta interface{}) error replicaCountProp, err := expandRedisClusterReplicaCount(d.Get("replica_count"), d, config) if err != nil { return err - } else if v, ok := d.GetOkExists("replica_count"); !tpgresource.IsEmptyValue(reflect.ValueOf(replicaCountProp)) && (ok || !reflect.DeepEqual(v, replicaCountProp)) { + } else if v, ok := d.GetOkExists("replica_count"); ok || !reflect.DeepEqual(v, replicaCountProp) { obj["replicaCount"] = replicaCountProp } shardCountProp, err := expandRedisClusterShardCount(d.Get("shard_count"), d, config) @@ -453,7 +453,7 @@ func resourceRedisClusterUpdate(d *schema.ResourceData, meta interface{}) error replicaCountProp, err := expandRedisClusterReplicaCount(d.Get("replica_count"), d, config) if err != nil { return err - } else if v, ok := d.GetOkExists("replica_count"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, replicaCountProp)) { + } else if v, ok := d.GetOkExists("replica_count"); ok || !reflect.DeepEqual(v, replicaCountProp) { obj["replicaCount"] = replicaCountProp } shardCountProp, err := expandRedisClusterShardCount(d.Get("shard_count"), d, config)