fix: aa regions datasource checks on aa database

Author: burythehammer

.github/workflows/terraform_provider_pr.yml

@@ -149,18 +149,6 @@ jobs:
           go-version-file: go.mod
       - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloud(PrivateServiceConnect_CRUDI|AclRule_CRUDI)"'
 
-  # all the aa datasource checks are included in the wider CRUDI test for aa subscriptions
-  go_test_smoke_aa_datasource:
-    name: go test smoke aa datasource
-    needs: [ go_build ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
-        with:
-          go-version-file: go.mod
-      - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloudActiveActiveSubscription_CRUDI"'
-
   tfproviderlint:
     name: tfproviderlint
     needs: [go_build]

go.mod

@@ -66,3 +66,5 @@ require (
 	google.golang.org/protobuf v1.36.3 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace github.com/RedisLabs/rediscloud-go-api => ../rediscloud-go-api

provider/rediscloud_active_active_database_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-// Checks CRUDI (CREATE,READ,UPDATE,IMPORT) operations on the database resource.
+// Checks CRUDI (CREATE, READ, UPDATE, IMPORT) operations on the database resource.
 func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
 
 	testAccRequiresEnvVar(t, "EXECUTE_TESTS")
@@ -24,6 +24,7 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
 	password := acctest.RandString(20)
 	const resourceName = "rediscloud_active_active_subscription_database.example"
 	const datasourceName = "data.rediscloud_active_active_subscription_database.example"
+	const datasourceRegionName = "data.rediscloud_active_active_subscription_regions.foo"
 	const subscriptionResourceName = "rediscloud_active_active_subscription.example"
 
 	var subId int
@@ -105,7 +106,7 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
 						return nil
 					},
 
-					// Test datasource
+					// Test subscription datasource
 					resource.TestCheckResourceAttrSet(datasourceName, "subscription_id"),
 					resource.TestCheckResourceAttrSet(datasourceName, "db_id"),
 					resource.TestCheckResourceAttr(datasourceName, "name", name),
@@ -119,6 +120,15 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
 
 					resource.TestCheckResourceAttr(datasourceName, "tags.deployment_family", "blue"),
 					resource.TestCheckResourceAttr(datasourceName, "tags.priority", "code-2"),
+
+					// Test the region datasource
+					resource.TestCheckResourceAttr(datasourceRegionName, "subscription_name", name),
+					resource.TestCheckResourceAttr(datasourceRegionName, "regions.0.region", "us-east-1"),
+					resource.TestCheckResourceAttr(datasourceRegionName, "regions.0.networking_deployment_cidr", "192.168.0.0/24"),
+					resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.0.vpc_id"),
+					resource.TestCheckResourceAttr(datasourceRegionName, "regions.1.region", "us-east-2"),
+					resource.TestCheckResourceAttr(datasourceRegionName, "regions.1.networking_deployment_cidr", "10.0.1.0/24"),
+					resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.1.vpc_id"),
 				),
 			},
 			// Test database is updated successfully, including updates to both global and local alerts and clearing modules
@@ -322,6 +332,10 @@ data "rediscloud_active_active_subscription_database" "example" {
 	subscription_id = rediscloud_active_active_subscription.example.id
 	name = rediscloud_active_active_subscription_database.example.name
 }
+
+data "rediscloud_active_active_subscription_regions" "foo" {
+	subscription_name = rediscloud_active_active_subscription.example.name
+}
 `
 
 // TF config for updating a database

provider/rediscloud_active_active_subscription_test.go

@@ -20,10 +20,11 @@ var activeActiveContractFlag = flag.Bool("activeActiveContract", false,
 var activeActiveMarketplaceFlag = flag.Bool("activeActiveMarketplace", false,
 	"Add this flag '-activeActiveMarketplace' to run tests for marketplace associated accounts")
 
-// Checks CRUDI (CREATE,READ,UPDATE,IMPORT) operations on the subscription resource.
+// Checks CRUDI (CREATE, READ, UPDATE, IMPORT) operations on the subscription resource.
+// Also checks active-active subscription regions.
 func TestAccResourceRedisCloudActiveActiveSubscription_CRUDI(t *testing.T) {
 
-	testAccRequiresEnvVar(t, "EXECUTE_TESTS")
+	//testAccRequiresEnvVar(t, "EXECUTE_TESTS")
 
 	name := acctest.RandomWithPrefix(testResourcePrefix)
 	const resourceName = "rediscloud_active_active_subscription.example"
@@ -165,11 +166,11 @@ func TestAccResourceRedisCloudActiveActiveSubscription_CRUDI(t *testing.T) {
 					// Test the region datasource
 
 					resource.TestCheckResourceAttr(datasourceRegionName, "subscription_name", name),
-					resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.0.regionId"),
+					//resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.0.regionId"),
 					resource.TestCheckResourceAttr(datasourceRegionName, "regions.0.region", "us-east-1"),
 					resource.TestCheckResourceAttr(datasourceRegionName, "regions.0.networking_deployment_cidr", "192.168.0.0/24"),
 					resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.0.vpc_id"),
-					resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.1.regionId"),
+					//resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.1.regionId"),
 					resource.TestCheckResourceAttr(datasourceRegionName, "regions.1.region", "us-east-2"),
 					resource.TestCheckResourceAttr(datasourceRegionName, "regions.1.networking_deployment_cidr", "10.0.1.0/24"),
 					resource.TestCheckResourceAttrSet(datasourceRegionName, "regions.1.vpc_id"),