Skip to content

Commit a07a3e9

Browse files
committed
test: moving aa sub tests over to the specific test for region resource
1 parent 06252f6 commit a07a3e9

File tree

4 files changed

+32
-16
lines changed

4 files changed

+32
-16
lines changed

.github/workflows/terraform_provider_pr.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140

141141
go_test_smoke_misc:
142142
name: go test smoke misc
143-
needs: [go_build]
143+
needs: [ go_build ]
144144
runs-on: ubuntu-latest
145145
steps:
146146
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -149,6 +149,18 @@ jobs:
149149
go-version-file: go.mod
150150
- run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloud(PrivateServiceConnect_CRUDI|AclRule_CRUDI)"'
151151

152+
# TODO: remove, temporary: tests the subscription regions
153+
go_test_smoke_aa_sub_regions:
154+
name: go test smoke aa sub regions
155+
needs: [go_build]
156+
runs-on: ubuntu-latest
157+
steps:
158+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
159+
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
160+
with:
161+
go-version-file: go.mod
162+
- run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloudActiveActiveSubscriptionRegions_CRUDI"'
163+
152164
tfproviderlint:
153165
name: tfproviderlint
154166
needs: [go_build]

provider/rediscloud_active_active_database_test.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
2222
password := acctest.RandString(20)
2323
const databaseResourceName = "rediscloud_active_active_subscription_database.example"
2424
const datasourceName = "data.rediscloud_active_active_subscription_database.example"
25-
const datasourceRegionName = "data.rediscloud_active_active_subscription_regions.foo"
25+
const datasourceRegionName = "data.rediscloud_active_active_subscription_regions.example"
2626
const subscriptionResourceName = "rediscloud_active_active_subscription.example"
2727

2828
var subId int
@@ -124,20 +124,9 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
124124
resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.0.vpc_id"),
125125
resource.TestCheckResourceAttr(datasourceRegionName, "regions.0.region", "us-east-1"),
126126
resource.TestCheckResourceAttr(datasourceRegionName, "regions.0.networking_deployment_cidr", "192.168.0.0/24"),
127-
128-
resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.0.databases.0.database_id"),
129-
resource.TestCheckResourceAttr(datasourceRegionName, "regions.0.databases.0.database_name", databaseName),
130-
resource.TestCheckResourceAttr(datasourceRegionName, "regions.0.databases.0.read_operations_per_second", "1000"),
131-
resource.TestCheckResourceAttr(datasourceRegionName, "regions.0.databases.0.write_operations_per_second", "1000"),
132-
133127
resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.1.vpc_id"),
134128
resource.TestCheckResourceAttr(datasourceRegionName, "regions.1.region", "us-east-2"),
135129
resource.TestCheckResourceAttr(datasourceRegionName, "regions.1.networking_deployment_cidr", "10.0.1.0/24"),
136-
137-
resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.1.databases.0.database_id"),
138-
resource.TestCheckResourceAttr(datasourceRegionName, "regions.1.databases.0.database_name", databaseName),
139-
resource.TestCheckResourceAttr(datasourceRegionName, "regions.1.databases.0.read_operations_per_second", "1000"),
140-
resource.TestCheckResourceAttr(datasourceRegionName, "regions.1.databases.0.write_operations_per_second", "1000"),
141130
),
142131
},
143132
// Test database is updated successfully, including updates to both global and local alerts and clearing modules
@@ -342,7 +331,7 @@ data "rediscloud_active_active_subscription_database" "example" {
342331
name = rediscloud_active_active_subscription_database.example.name
343332
}
344333
345-
data "rediscloud_active_active_subscription_regions" "foo" {
334+
data "rediscloud_active_active_subscription_regions" "example" {
346335
subscription_name = rediscloud_active_active_subscription.example.name
347336
}
348337
`

provider/rediscloud_active_active_subscription_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestAccResourceRedisCloudActiveActiveSubscription_CRUDI(t *testing.T) {
2929
name := acctest.RandomWithPrefix(testResourcePrefix)
3030
const resourceName = "rediscloud_active_active_subscription.example"
3131
const datasourceSubscriptionName = "data.rediscloud_active_active_subscription.example"
32-
const datasourceRegionName = "data.rediscloud_active_active_subscription_regions.foo"
32+
const datasourceRegionName = "data.rediscloud_active_active_subscription_regions.example"
3333

3434
var subId int
3535

@@ -426,7 +426,7 @@ data "rediscloud_active_active_subscription" "example" {
426426
name = rediscloud_active_active_subscription.example.name
427427
}
428428
429-
data "rediscloud_active_active_subscription_regions" "foo" {
429+
data "rediscloud_active_active_subscription_regions" "example" {
430430
subscription_name = rediscloud_active_active_subscription.example.name
431431
}
432432
`

provider/resource_rediscloud_active_active_subscription_regions_test.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ func TestAccResourceRedisCloudActiveActiveSubscriptionRegions_CRUDI(t *testing.T
2020
dbName := acctest.RandomWithPrefix(testResourcePrefix) + "-regions" + "-db"
2121
dbPass := acctest.RandString(20)
2222
const resourceName = "rediscloud_active_active_subscription_regions.example"
23+
const datasourceRegionName = "data.rediscloud_active_active_subscription_regions.example"
2324

2425
var subId int
2526

@@ -39,6 +40,16 @@ func TestAccResourceRedisCloudActiveActiveSubscriptionRegions_CRUDI(t *testing.T
3940
resource.TestCheckResourceAttr(resourceName, "region.2.database.0.local_write_operations_per_second", "1500"),
4041
resource.TestCheckResourceAttr(resourceName, "region.2.database.0.local_read_operations_per_second", "1500"),
4142

43+
// Test the db regions datasource
44+
resource.TestCheckResourceAttr(datasourceRegionName, "subscription_name", subName),
45+
resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.2.vpc_id"),
46+
resource.TestCheckResourceAttr(datasourceRegionName, "regions.2.region", "us-west-2"),
47+
resource.TestCheckResourceAttr(datasourceRegionName, "regions.2.networking_deployment_cidr", "10.2.0.0/24"),
48+
resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.2.databases.0.database_id"),
49+
resource.TestCheckResourceAttr(datasourceRegionName, "regions.2.databases.0.database_name", dbName),
50+
resource.TestCheckResourceAttr(datasourceRegionName, "regions.2.databases.0.read_operations_per_second", "1500"),
51+
resource.TestCheckResourceAttr(datasourceRegionName, "regions.2.databases.0.write_operations_per_second", "1500"),
52+
4253
func(s *terraform.State) error {
4354
r := s.RootModule().Resources[resourceName]
4455

@@ -152,6 +163,10 @@ resource "rediscloud_active_active_subscription_database" "example" {
152163
}
153164
}
154165
166+
data "rediscloud_active_active_subscription_regions" "example" {
167+
subscription_name = rediscloud_active_active_subscription.example.name
168+
}
169+
155170
`
156171

157172
// TF config for provisioning a new region.

0 commit comments

Comments
 (0)