Skip to content

Commit 7f35931

Browse files
Fix for Issue 21374 (#13423) (#9621)
[upstream:8d6b32e2e19fa9edbba3fbcd1f6713e92cdbbf91] Signed-off-by: Modular Magician <[email protected]>
1 parent feaac76 commit 7f35931

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

.changelog/13423.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
redis: fix for test failure TestAccRedisCluster_updateClusterEndpoints issue 21374
3+
```

google-beta/services/redis/resource_redis_cluster_user_created_connections.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,12 @@ func flattenRedisClusterUserCreatedConnectionsClusterEndpoints(v interface{}, d
462462
// Do not include empty json objects coming back from the api
463463
continue
464464
}
465+
connection := flattenRedisClusterUserCreatedConnectionsClusterEndpointsConnections(original["connections"], d, config)
466+
if len(connection.([]interface{})) == 0 {
467+
continue
468+
}
465469
transformed = append(transformed, map[string]interface{}{
466-
"connections": flattenRedisClusterUserCreatedConnectionsClusterEndpointsConnections(original["connections"], d, config),
470+
"connections": connection,
467471
})
468472
}
469473
return transformed
@@ -480,9 +484,14 @@ func flattenRedisClusterUserCreatedConnectionsClusterEndpointsConnections(v inte
480484
// Do not include empty json objects coming back from the api
481485
continue
482486
}
487+
pscConnections := flattenRedisClusterUserCreatedConnectionsClusterEndpointsConnectionsPscConnection(original["pscConnection"], d, config)
488+
if pscConnections == nil {
489+
continue
490+
}
483491
transformed = append(transformed, map[string]interface{}{
484-
"psc_connection": flattenRedisClusterUserCreatedConnectionsClusterEndpointsConnectionsPscConnection(original["pscConnection"], d, config),
492+
"psc_connection": pscConnections,
485493
})
494+
486495
}
487496
return transformed
488497
}

0 commit comments

Comments
 (0)