feat: adding global default user field to active active databases

Author: burythehammer

.claude/settings.local.json

@@ -30,6 +30,8 @@ website/node_modules
 website/vendor
 vendor
 .vscode/
+.claude/
+CLAUDE.md
 
 # Test exclusions
 !command/test-fixtures/**/*.tfstate

.gitignore

@@ -103,6 +103,7 @@ The following arguments are supported:
 * `global_alert` - (Optional) A block defining Redis database alert of regions that don't override global settings, documented below, can be specified multiple times. (either: 'dataset-size', 'datasets-size', 'throughput-higher-than', 'throughput-lower-than', 'latency', 'syncsource-error', 'syncsource-lag' or 'connections-limit')
 * `global_modules` - (Optional) A list of modules to be enabled on all deployments of this database. Supported modules: `RedisJSON`, `RediSearch`. Ignored after database creation.
 * `global_source_ips` - (Optional) List of source IP addresses or subnet masks of regions that don't override global settings. If specified, Redis clients will be able to connect to this database only from within the specified source IP addresses ranges (example: ['192.168.10.0/32', '192.168.12.0/24'])
+* `global_enable_default_user` - (Optional) When 'true', enables connecting to the database with the 'default' user across all regions. Default: 'true'
 * `global_resp_version` - (Optional) Either 'resp2' or 'resp3'. Resp version for Crdb databases within the AA database. Must be compatible with Redis version.
 * `port` - (Optional) TCP port on which the database is available - must be between 10000 and 19999. **Modifying this attribute will force creation of a new resource.**
 * `override_region` - (Optional) Override region specific configuration, documented below

docs/resources/rediscloud_active_active_subscription_database.md

@@ -5,7 +5,7 @@ go 1.24.0
 toolchain go1.24.1
 
 require (
-	github.com/RedisLabs/rediscloud-go-api v0.36.5
+	github.com/RedisLabs/rediscloud-go-api v0.37.0
 	github.com/bflad/tfproviderlint v0.31.0
 	github.com/hashicorp/go-cty v1.5.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
@@ -71,4 +71,4 @@ require (
 )
 
 // for local development, uncomment this
-//replace github.com/RedisLabs/rediscloud-go-api => ../rediscloud-go-api
+replace github.com/RedisLabs/rediscloud-go-api => ../rediscloud-go-api

go.mod

@@ -4,8 +4,6 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
 github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
-github.com/RedisLabs/rediscloud-go-api v0.36.5 h1:zZ5C2+QHdfdlGqZDw3o2GMM7Wz5BhLUUW8U3yGFl1ck=
-github.com/RedisLabs/rediscloud-go-api v0.36.5/go.mod h1:Hkh3i/EsHnyfgV0ijednbofz/EmZC3sFnSNNruF3G6I=
 github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
 github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=

go.sum

@@ -3,13 +3,13 @@ package provider
 import (
 	"context"
 	"fmt"
-	client2 "github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
 	"os"
 	"regexp"
 	"strconv"
 	"testing"
 
 	"github.com/RedisLabs/rediscloud-go-api/redis"
+	"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
@@ -39,7 +39,7 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					// Test resource
 					resource.TestCheckResourceAttr(databaseResourceName, "name", databaseName),
-					resource.TestCheckResourceAttr(databaseResourceName, "dataset_size_in_gb", "3"),
+					resource.TestCheckResourceAttr(databaseResourceName, "dataset_size_in_gb", "1"),
 					resource.TestCheckResourceAttr(databaseResourceName, "support_oss_cluster_api", "false"),
 					resource.TestCheckResourceAttr(databaseResourceName, "global_data_persistence", "none"),
 					resource.TestCheckResourceAttr(databaseResourceName, "external_endpoint_for_oss_cluster_api", "false"),
@@ -52,6 +52,7 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
 					resource.TestCheckResourceAttr(databaseResourceName, "global_modules.#", "1"),
 					resource.TestCheckResourceAttr(databaseResourceName, "global_modules.0", "RedisJSON"),
 					resource.TestCheckResourceAttr(databaseResourceName, "global_source_ips.#", "2"),
+					resource.TestCheckResourceAttr(databaseResourceName, "global_enable_default_user", "true"),
 
 					resource.TestCheckResourceAttr(databaseResourceName, "override_region.#", "2"),
 					resource.TestCheckResourceAttr(databaseResourceName, "override_region.0.name", "us-east-1"),
@@ -84,8 +85,8 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
 							return fmt.Errorf("couldn't parse the subscription ID: %s", redis.StringValue(&r.Primary.ID))
 						}
 
-						client := testProvider.Meta().(*client2.ApiClient)
-						sub, err := client.Client.Subscription.Get(context.TODO(), subId)
+						apiClient := testProvider.Meta().(*client.ApiClient)
+						sub, err := apiClient.Client.Subscription.Get(context.TODO(), subId)
 						if err != nil {
 							return err
 						}
@@ -94,7 +95,7 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
 							return fmt.Errorf("unexpected name value: %s", redis.StringValue(sub.Name))
 						}
 
-						listDb := client.Client.Database.List(context.TODO(), subId)
+						listDb := apiClient.Client.Database.List(context.TODO(), subId)
 						if listDb.Next() != true {
 							return fmt.Errorf("no database found: %s", listDb.Err())
 						}
@@ -109,7 +110,7 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
 					resource.TestCheckResourceAttrSet(datasourceName, "subscription_id"),
 					resource.TestCheckResourceAttrSet(datasourceName, "db_id"),
 					resource.TestCheckResourceAttr(datasourceName, "name", databaseName),
-					resource.TestCheckResourceAttr(datasourceName, "dataset_size_in_gb", "3"),
+					resource.TestCheckResourceAttr(datasourceName, "dataset_size_in_gb", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "support_oss_cluster_api", "false"),
 					resource.TestCheckResourceAttr(datasourceName, "external_endpoint_for_oss_cluster_api", "false"),
 					resource.TestCheckResourceAttr(datasourceName, "enable_tls", "false"),
@@ -118,6 +119,7 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "data_eviction", "volatile-lru"),
 					resource.TestCheckResourceAttr(datasourceName, "global_modules.#", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "global_modules.0", "RedisJSON"),
+					resource.TestCheckResourceAttr(datasourceName, "global_enable_default_user", "true"),
 
 					resource.TestCheckResourceAttr(datasourceName, "tags.deployment_family", "blue"),
 					resource.TestCheckResourceAttr(datasourceName, "tags.priority", "code-2"),
@@ -145,6 +147,7 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
 					resource.TestCheckResourceAttr(databaseResourceName, "global_alert.#", "1"),
 					resource.TestCheckResourceAttr(databaseResourceName, "global_alert.0.name", "dataset-size"),
 					resource.TestCheckResourceAttr(databaseResourceName, "global_alert.0.value", "60"),
+					resource.TestCheckResourceAttr(databaseResourceName, "global_enable_default_user", "false"),
 					resource.TestCheckResourceAttr(databaseResourceName, "redis_version", "7.2"),
 
 					// Changes are ignored after creation
@@ -299,7 +302,7 @@ const testAccResourceRedisCloudActiveActiveDatabase = activeActiveSubscriptionBo
 resource "rediscloud_active_active_subscription_database" "example" {
     subscription_id = rediscloud_active_active_subscription.example.id
     name = "%s"
-    dataset_size_in_gb = 3
+    dataset_size_in_gb = 1
     support_oss_cluster_api = false 
     external_endpoint_for_oss_cluster_api = false
 	enable_tls = false
@@ -312,6 +315,7 @@ resource "rediscloud_active_active_subscription_database" "example" {
 		name = "dataset-size"
 		value = 1
 	}
+	global_enable_default_user = true
 	global_modules = ["RedisJSON"]
 	override_region {
 		name = "us-east-1"
@@ -360,6 +364,7 @@ resource "rediscloud_active_active_subscription_database" "example" {
 		name = "dataset-size"
 		value = 60
 	}
+	global_enable_default_user = false
 	global_modules = []
 
 	override_region {
@@ -442,7 +447,7 @@ resource "rediscloud_active_active_subscription" "example" {
 resource "rediscloud_active_active_subscription_database" "example" {
 	subscription_id = rediscloud_active_active_subscription.example.id
 	name = "%s"
-	dataset_size_in_gb = 3
+	dataset_size_in_gb = 1
 	support_oss_cluster_api = false 
 	external_endpoint_for_oss_cluster_api = false
 	enable_tls = false
@@ -476,7 +481,7 @@ const testAccResourceRedisCloudActiveActiveDatabaseInvalidTimeUtc = activeActive
 resource "rediscloud_active_active_subscription_database" "example" {
 	subscription_id = rediscloud_active_active_subscription.example.id
 	name = "%s"
-	dataset_size_in_gb = 3
+	dataset_size_in_gb = 1
 	support_oss_cluster_api = false 
 	external_endpoint_for_oss_cluster_api = false
 	enable_tls = false

provider/rediscloud_active_active_database_test.go

@@ -2,15 +2,15 @@ package provider
 
 import (
 	"context"
-	"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
-	"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
 	"log"
 	"regexp"
 	"strings"
 	"time"
 
 	"github.com/RedisLabs/rediscloud-go-api/redis"
 	"github.com/RedisLabs/rediscloud-go-api/service/databases"
+	"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
+	"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -200,6 +200,12 @@ func resourceRedisCloudActiveActiveDatabase() *schema.Resource {
 					ValidateDiagFunc: validation.ToDiagFunc(validation.IsCIDR),
 				},
 			},
+			"global_enable_default_user": {
+				Description: "When 'true', enables connecting to the database with the 'default' user across all regions. Default: 'true'",
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+			},
 			"override_region": {
 				Description: "Region-specific configuration parameters to override the global configuration",
 				Type:        schema.TypeSet,
@@ -733,12 +739,9 @@ func resourceRedisCloudActiveActiveDatabaseUpdate(ctx context.Context, d *schema
 
 	// Populate the database update request with the required fields
 	update := databases.UpdateActiveActiveDatabase{
-		SupportOSSClusterAPI:                redis.Bool(d.Get("support_oss_cluster_api").(bool)),
-		UseExternalEndpointForOSSClusterAPI: redis.Bool(d.Get("external_endpoint_for_oss_cluster_api").(bool)),
-		DataEvictionPolicy:                  redis.String(d.Get("data_eviction").(string)),
-		GlobalAlerts:                        &updateAlerts,
-		GlobalSourceIP:                      globalSourceIps,
-		Regions:                             regions,
+		GlobalAlerts:   &updateAlerts,
+		GlobalSourceIP: globalSourceIps,
+		Regions:        regions,
 	}
 
 	// One of the following fields must be set in the request, validation is handled in the schema (ExactlyOneOf)
@@ -763,6 +766,22 @@ func resourceRedisCloudActiveActiveDatabaseUpdate(ctx context.Context, d *schema
 		update.GlobalDataPersistence = redis.String(d.Get("global_data_persistence").(string))
 	}
 
+	if v, ok := d.GetOk("global_enable_default_user"); ok {
+		update.GlobalEnableDefaultUser = redis.Bool(v.(bool))
+	}
+
+	if v, ok := d.GetOk("support_oss_cluster_api"); ok {
+		update.SupportOSSClusterAPI = redis.Bool(v.(bool))
+	}
+
+	if v, ok := d.GetOk("external_endpoint_for_oss_cluster_api"); ok {
+		update.UseExternalEndpointForOSSClusterAPI = redis.Bool(v.(bool))
+	}
+
+	if v, ok := d.GetOk("data_eviction"); ok {
+		update.DataEvictionPolicy = redis.String(v.(string))
+	}
+
 	//The cert validation is done by the API (HTTP 400 is returned if it's invalid).
 	clientSSLCertificate := d.Get("client_ssl_certificate").(string)
 	clientTLSCertificates := interfaceToStringSlice(d.Get("client_tls_certificates").([]interface{}))
@@ -788,8 +807,6 @@ func resourceRedisCloudActiveActiveDatabaseUpdate(ctx context.Context, d *schema
 		}
 	}
 
-	update.UseExternalEndpointForOSSClusterAPI = redis.Bool(d.Get("external_endpoint_for_oss_cluster_api").(bool))
-
 	err = api.Client.Database.ActiveActiveUpdate(ctx, subId, dbId, update)
 	if err != nil {
 		return diag.FromErr(err)

provider/resource_rediscloud_active_active_database.go

@@ -3,11 +3,11 @@ package provider
 import (
 	"context"
 	"fmt"
-	client2 "github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
 	"strconv"
 	"testing"
 
 	"github.com/RedisLabs/rediscloud-go-api/redis"
+	"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
@@ -60,8 +60,8 @@ func TestAccResourceRedisCloudActiveActiveSubscriptionRegions_CRUDI(t *testing.T
 							return err
 						}
 
-						client := testProvider.Meta().(*client2.ApiClient)
-						sub, err := client.Client.Subscription.Get(context.TODO(), subId)
+						apiClient := testProvider.Meta().(*client.ApiClient)
+						sub, err := apiClient.Client.Subscription.Get(context.TODO(), subId)
 						if err != nil {
 							return err
 						}