Skip to content

Commit 6c9e3b2

Browse files
committed
feat: enable_default_user is now set to true globally and true for regional overrides
1 parent e7e08ad commit 6c9e3b2

6 files changed

+23
-4
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
44
See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
55

66

7+
# Unreleased
8+
9+
## Changed
10+
- Reverted global/regional override rework from v2.7.3 due to regressions. Active-Active database global configuration behavior has been restored to v2.7.2 state. Transit Gateway improvements from v2.7.3 have been preserved.
11+
- `global_enable_default_user` now have a default override of `true`. This is due to technical limitations in the current Terraform SDK framework. If you wish to turn off the default user per region you have to explicitly do so.
12+
13+
714
# 2.7.3 (6th November 2025)
815

916
## Changed

provider/rediscloud_active_active_database_block_public_endpoints_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,20 @@ func TestAccActiveActiveSubscriptionDatabase_BlockPublicEndpoints(t *testing.T)
4141
// Global source IPs should be explicitly set
4242
resource.TestCheckResourceAttr(databaseResource, "global_source_ips.#", "1"),
4343
resource.TestCheckTypeSetElemAttr(databaseResource, "global_source_ips.*", "192.168.0.0/16"),
44+
resource.TestCheckResourceAttr(databaseResource, "global_enable_default_user", "true"),
4445

4546
// Override region 0 (us-east-2) has explicit override of source_ips
4647
resource.TestCheckResourceAttr(databaseResource, "override_region.0.override_global_source_ips.#", "1"),
4748
resource.TestCheckTypeSetElemAttr(databaseResource, "override_region.0.override_global_source_ips.*", "172.16.0.0/16"),
4849
resource.TestCheckResourceAttr(databaseResource, "override_region.0.source_ips.#", "1"),
4950
resource.TestCheckTypeSetElemAttr(databaseResource, "override_region.0.source_ips.*", "172.16.0.0/16"),
51+
resource.TestCheckResourceAttr(databaseResource, "override_region.0.enable_default_user", "true"),
5052

5153
// Override region 1 (us-east-1) has no override, should inherit global
5254
resource.TestCheckResourceAttr(databaseResource, "override_region.1.override_global_source_ips.#", "0"),
5355
resource.TestCheckResourceAttr(databaseResource, "override_region.1.source_ips.#", "1"),
5456
resource.TestCheckTypeSetElemAttr(databaseResource, "override_region.1.source_ips.*", "192.168.0.0/16"),
57+
resource.TestCheckResourceAttr(databaseResource, "override_region.1.enable_default_user", "true"),
5558

5659
// Data source checks
5760
resource.TestCheckResourceAttr(datasourceName, "name", subscriptionName),
@@ -71,11 +74,13 @@ func TestAccActiveActiveSubscriptionDatabase_BlockPublicEndpoints(t *testing.T)
7174
// Global source IPs should be the same (explicitly set in testdata)
7275
resource.TestCheckResourceAttr(databaseResource, "global_source_ips.#", "1"),
7376
resource.TestCheckTypeSetElemAttr(databaseResource, "global_source_ips.*", "192.168.0.0/16"),
77+
resource.TestCheckResourceAttr(databaseResource, "global_enable_default_user", "true"),
7478
// Override regions should have the same overrides
7579
resource.TestCheckResourceAttr(databaseResource, "override_region.0.override_global_source_ips.#", "1"),
7680
resource.TestCheckTypeSetElemAttr(databaseResource, "override_region.0.override_global_source_ips.*", "172.16.0.0/16"),
7781
resource.TestCheckResourceAttr(databaseResource, "override_region.0.source_ips.#", "1"),
7882
resource.TestCheckTypeSetElemAttr(databaseResource, "override_region.0.source_ips.*", "172.16.0.0/16"),
83+
resource.TestCheckResourceAttr(databaseResource, "override_region.0.enable_default_user", "true"),
7984
// Data source checks after update
8085
resource.TestCheckResourceAttr(datasourceName, "name", subscriptionName),
8186
resource.TestCheckResourceAttr(datasourceName, "global_source_ips.#", "1"),

provider/rediscloud_active_active_database_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
182182
resource.TestCheckResourceAttr(databaseResourceName, "global_alert.#", "0"),
183183
resource.TestCheckResourceAttr(databaseResourceName, "global_modules.#", "1"),
184184
resource.TestCheckResourceAttr(databaseResourceName, "global_modules.0", "RedisJSON"),
185+
resource.TestCheckResourceAttr(databaseResourceName, "global_enable_default_user", "true"),
185186

186187
resource.TestCheckResourceAttr(databaseResourceName, "override_region.#", "1"),
187188
resource.TestCheckResourceAttr(databaseResourceName, "override_region.0.name", "us-east-1"),
@@ -239,6 +240,7 @@ func TestAccResourceRedisCloudActiveActiveDatabase_optionalAttributes(t *testing
239240
Config: fmt.Sprintf(testAccResourceRedisCloudActiveActiveDatabaseOptionalAttributes, subscriptionName, name, password, portNumber),
240241
Check: resource.ComposeAggregateTestCheckFunc(
241242
resource.TestCheckResourceAttr(resourceName, "port", strconv.Itoa(portNumber)),
243+
resource.TestCheckResourceAttr(resourceName, "global_enable_default_user", "true"),
242244
),
243245
},
244246
},

provider/rediscloud_active_active_subscription_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,9 @@ func TestAccResourceRedisCloudActiveActiveSubscription_CRUDI(t *testing.T) {
199199
resource.TestCheckResourceAttr(resourceName, "creation_plan.0.region.1.write_operations_per_second", "1000"),
200200
resource.TestCheckResourceAttr(resourceName, "creation_plan.0.region.1.read_operations_per_second", "1000"),
201201

202+
// Check database enable_default_user settings
203+
resource.TestCheckResourceAttr("rediscloud_active_active_subscription_database.example", "global_enable_default_user", "false"),
204+
202205
// also checks user has removed default user
203206
//resource.TestCheckResourceAttr(resourceName, "regions.1.enable_default_user", "false"),
204207

provider/resource_rediscloud_active_active_database.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ func resourceRedisCloudActiveActiveDatabase() *schema.Resource {
205205
Description: "When 'true', enables connecting to the database with the 'default' user across all regions. Default: 'true'",
206206
Type: schema.TypeBool,
207207
Optional: true,
208+
Default: true,
208209
},
209210
"auto_minor_version_upgrade": {
210211
Description: "When 'true', enables auto minor version upgrades for this database. Default: 'true'",
@@ -265,9 +266,10 @@ func resourceRedisCloudActiveActiveDatabase() *schema.Resource {
265266
Optional: true,
266267
},
267268
"enable_default_user": {
268-
Description: "When 'true', enables connecting to the database with the 'default' user. If not set, the global setting will be used.",
269+
Description: "When 'true', enables connecting to the database with the 'default' user. Default: 'true'",
269270
Type: schema.TypeBool,
270271
Optional: true,
272+
Default: true,
271273
},
272274
"remote_backup": {
273275
Description: "An object that specifies the backup options for the database in this region",

provider/resource_rediscloud_active_active_subscription.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import (
44
"bytes"
55
"context"
66
"fmt"
7-
"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
8-
"github.com/RedisLabs/terraform-provider-rediscloud/provider/pro"
9-
"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
107
"regexp"
118
"strconv"
129
"time"
1310

1411
"github.com/RedisLabs/rediscloud-go-api/redis"
1512
"github.com/RedisLabs/rediscloud-go-api/service/maintenance"
1613
"github.com/RedisLabs/rediscloud-go-api/service/subscriptions"
14+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
15+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/pro"
16+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
1717
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1818
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1919
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"

0 commit comments

Comments
 (0)