Skip to content

Commit fe3b903

Browse files
Merge pull request #704 from RedisLabs/fix/revert-regressions-in-global-overrides
Revert regressions in global overrides
2 parents ba297da + 671fa5a commit fe3b903

19 files changed

+123
-1143
lines changed

.github/workflows/terraform_provider_pr.yml

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -56,28 +56,6 @@ jobs:
5656
name: go build
5757
run: go build -o terraform-plugin-dir/registry.terraform.io/RedisLabs/rediscloud/99.99.99/$(go env GOOS)_$(go env GOARCH)/terraform-provider-rediscloud .
5858

59-
go_unit_test:
60-
name: go unit test
61-
needs: [go_build]
62-
runs-on: ubuntu-latest
63-
steps:
64-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
65-
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
66-
with:
67-
go-version-file: go.mod
68-
- run: go test ./... -run="^TestUnit" # Runs tests starting with TestUnit
69-
70-
tfproviderlint:
71-
name: tfproviderlint
72-
needs: [go_build]
73-
runs-on: ubuntu-latest
74-
steps:
75-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
76-
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
77-
with:
78-
go-version-file: go.mod
79-
- run: make tfproviderlint
80-
8159
terraform_providers_schema:
8260
name: terraform providers schema
8361
needs: [go_build]
@@ -124,29 +102,28 @@ jobs:
124102
mkdir terraform-providers-schema
125103
terraform providers schema -json > terraform-providers-schema/schema.json
126104
127-
# All acceptance tests run in parallel after quick tests
128-
go_test_smoke_aa_tgw_attachment:
129-
if: false # Temporarily disabled - TGW tests not ready yet
130-
name: go test smoke aa tgw attachment
131-
needs: [go_unit_test, tfproviderlint, terraform_providers_schema]
105+
go_unit_test:
106+
name: go unit test
107+
needs: [go_build]
132108
runs-on: ubuntu-latest
133109
steps:
134110
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
135111
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
136112
with:
137113
go-version-file: go.mod
138-
- run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloudActiveActiveTransitGatewayAttachment_CRUDI"'
114+
- run: go test ./... -run="^TestUnit" # Runs tests starting with TestUnit
139115

140-
go_test_smoke_aa_enable_default_user:
141-
name: go test smoke aa enable default user
116+
go_test_smoke_aa_tgw_attachment:
117+
if: false # Temporarily disabled - TGW tests not ready yet
118+
name: go test smoke aa tgw attachment
142119
needs: [go_unit_test, tfproviderlint, terraform_providers_schema]
143120
runs-on: ubuntu-latest
144121
steps:
145122
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
146123
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
147124
with:
148125
go-version-file: go.mod
149-
- run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloudActiveActiveDatabase_enableDefaultUser"'
126+
- run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloudActiveActiveTransitGatewayAttachment_CRUDI"'
150127

151128
go_test_smoke_aa_db:
152129
name: go test smoke aa db
@@ -250,3 +227,14 @@ jobs:
250227
with:
251228
go-version-file: go.mod
252229
- run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloudProDatabase_qpf"'
230+
231+
tfproviderlint:
232+
name: tfproviderlint
233+
needs: [go_build]
234+
runs-on: ubuntu-latest
235+
steps:
236+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
237+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
238+
with:
239+
go-version-file: go.mod
240+
- run: make tfproviderlint

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ 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+
# 2.7.4 (7th November 2025)
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+
- `rediscloud_active_active_subscription_database`: Both `global_enable_default_user` and the region-level `enable_default_user` (in `override_region` blocks) now default to `true`. To disable the default user in a specific region, you must explicitly set `enable_default_user = false` in that region's `override_region` block.
12+
713
# 2.7.3 (6th November 2025)
814

915
## Changed

docs/data-sources/rediscloud_active_active_subscription_database.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ data "rediscloud_active_active_subscription_database" "example" {
5050
* `enable_tls` - Enable TLS for database.
5151
* `tls_certificate` - TLS certificate used for authentication.
5252
* `global_source_ips` - Set of CIDR addresses to allow access to the database.
53+
* `global_enable_default_user` - Whether the 'default' user is enabled for connecting to the database across all regions.
5354
* `data_eviction` - The data items eviction policy.
5455
* `global_modules` - A list of modules to be enabled on all deployments of this database.
5556
* `public_endpoint` - Public endpoint to access the database.

docs/resources/rediscloud_active_active_subscription_database.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ The following arguments are supported:
103103
* `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')
104104
* `global_modules` - (Optional) A list of modules to be enabled on all deployments of this database. Supported modules: `RedisJSON`, `RediSearch`. Ignored after database creation.
105105
* `global_source_ips` - (Optional) List of source IP addresses or subnet masks that are allowed to connect to the database across all regions that don't override this setting (example: ['192.168.10.0/32', '192.168.12.0/24']). When not specified, the default behavior depends on the subscription's `public_endpoint_access` setting: if `false`, defaults to RFC1918 private IP ranges (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 100.64.0.0/10); if `true`, defaults to 0.0.0.0/0 (unrestricted public access)
106-
* `global_enable_default_user` - (Optional) When 'true', enables connecting to the database with the 'default' user across all regions. Default: 'true'
106+
* `global_enable_default_user` - (Optional) When 'true', enables connecting to the database with the 'default' user across all regions. Default: 'true'. To disable, explicitly set to 'false'
107107
* `global_resp_version` - (Optional) Either 'resp2' or 'resp3'. Resp version for Crdb databases within the AA database. Must be compatible with Redis version.
108108
* `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.**
109109
* `override_region` - (Optional) Override region specific configuration, documented below
@@ -117,7 +117,7 @@ The `override_region` block supports:
117117
* `override_global_source_ips` - (Optional) List of source IP addresses or subnet masks that are allowed to connect to the database in this specific region, overriding the global `global_source_ips` setting (example: ['192.168.10.0/32', '192.168.12.0/24']). If not specified, the global `global_source_ips` setting applies to this region
118118
* `override_global_data_persistence` - (Optional) Regional instance of an Active-Active database data persistence rate (in persistent storage)
119119
* `remote_backup` - (Optional) Specifies the backup options for the database in this region, documented below
120-
* `enable_default_user` - (Optional) Whether the default user should be enabled or not. True by default.
120+
* `enable_default_user` - (Optional) Whether the default user should be enabled for this specific region. Default: 'true'. To disable the default user for this region, you must explicitly set this to 'false'
121121

122122
The `override_global_alert` block supports:
123123

provider/activeactive/testdata/enable_default_user_all_explicit.tf

Lines changed: 0 additions & 54 deletions
This file was deleted.

provider/activeactive/testdata/enable_default_user_global_false_region_true.tf

Lines changed: 0 additions & 53 deletions
This file was deleted.

provider/activeactive/testdata/enable_default_user_global_true_inherit.tf

Lines changed: 0 additions & 52 deletions
This file was deleted.

provider/activeactive/testdata/enable_default_user_mixed_overrides.tf

Lines changed: 0 additions & 53 deletions
This file was deleted.

provider/datasource_rediscloud_essentials_database.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package provider
22

33
import (
44
"context"
5-
65
"github.com/RedisLabs/rediscloud-go-api/redis"
76
fixedDatabases "github.com/RedisLabs/rediscloud-go-api/service/fixed/databases"
87
"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"

0 commit comments

Comments
 (0)