chore: update rediscloud-go-api and add AA test sweepers

go.mod

@@ -3,7 +3,7 @@ module github.com/RedisLabs/terraform-provider-rediscloud
 go 1.17
 
 require (
-	github.com/RedisLabs/rediscloud-go-api v0.1.13-0.20230109190658-f23d278d2f07
+	github.com/RedisLabs/rediscloud-go-api v0.1.13
 	github.com/bflad/tfproviderlint v0.28.1
 	github.com/google/go-cmp v0.5.9
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320

go.sum

@@ -386,8 +386,8 @@ github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugX
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C67SkzkDfmQuVln04ygHj3vjZfd9FL+GmQQ=
 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
-github.com/RedisLabs/rediscloud-go-api v0.1.13-0.20230109190658-f23d278d2f07 h1:FNeb7D66InroDIXxvPdlt4OoE8GfsIFOO4wI+LwbE8k=
-github.com/RedisLabs/rediscloud-go-api v0.1.13-0.20230109190658-f23d278d2f07/go.mod h1:EJXWMnC2ZSM5m7k2TCnmxenYv57o6yGlZXo0ZVnMgIs=
+github.com/RedisLabs/rediscloud-go-api v0.1.13 h1:j+mukOiAoE/NGMLSsJKA/J4AcBhe3E8Zy6ItcWhzxfU=
+github.com/RedisLabs/rediscloud-go-api v0.1.13/go.mod h1:EJXWMnC2ZSM5m7k2TCnmxenYv57o6yGlZXo0ZVnMgIs=
 github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
 github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
 github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=

internal/provider/sweeper_test.go

@@ -3,17 +3,18 @@ package provider
 import (
 	"context"
 	"fmt"
+	"log"
+	"os"
+	"strings"
+	"testing"
+	"time"
+
 	rediscloud_api "github.com/RedisLabs/rediscloud-go-api"
 	"github.com/RedisLabs/rediscloud-go-api/redis"
 	"github.com/RedisLabs/rediscloud-go-api/service/cloud_accounts"
 	"github.com/RedisLabs/rediscloud-go-api/service/databases"
 	"github.com/RedisLabs/rediscloud-go-api/service/subscriptions"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"log"
-	"os"
-	"strings"
-	"testing"
-	"time"
 )
 
 const testResourcePrefix = "tf-test"
@@ -49,9 +50,13 @@ func init() {
 		Name: "rediscloud_subscription",
 		F:    testSweepSubscriptions,
 	})
+	resource.AddTestSweepers("rediscloud_active_active_subscription", &resource.Sweeper{
+		Name: "rediscloud_active_active_subscription",
+		F:    testSweepActiveActiveSubscriptions,
+	})
 	resource.AddTestSweepers("rediscloud_cloud_account", &resource.Sweeper{
 		Name:         "rediscloud_cloud_account",
-		Dependencies: []string{"rediscloud_subscription"}, // in case a subscription depends on an account
+		Dependencies: []string{"rediscloud_subscription", "rediscloud_active_active_subscription"}, // in case a subscription depends on an account
 		F:            testSweepCloudAccounts,
 	})
 }
@@ -105,6 +110,10 @@ func testSweepSubscriptions(region string) error {
 			continue
 		}
 
+		if redis.StringValue(sub.DeploymentType) != subscriptions.SubscriptionDeploymentTypeSingleRegion {
+			continue
+		}
+
 		subId := redis.IntValue(sub.ID)
 		sweepSub, dbIds, err := testSweepReadDatabases(client, subId)
 		if err != nil {
@@ -163,3 +172,53 @@ func testSweepReadDatabases(client *rediscloud_api.Client, subId int) (bool, []i
 
 	return true, dbIds, nil
 }
+
+func testSweepActiveActiveSubscriptions(region string) error {
+	client, err := sharedClientForRegion(region)
+	if err != nil {
+		return err
+	}
+
+	list, err := client.Subscription.List(context.TODO())
+	if err != nil {
+		return err
+	}
+
+	for _, sub := range list {
+		if redis.StringValue(sub.Status) != subscriptions.SubscriptionStatusActive {
+			continue
+		}
+
+		if !strings.HasPrefix(redis.StringValue(sub.Name), "tf-test") {
+			continue
+		}
+
+		if redis.StringValue(sub.DeploymentType) != subscriptions.SubscriptionDeploymentTypeActiveActive {
+			continue
+		}
+
+		subId := redis.IntValue(sub.ID)
+		sweepSub, dbIds, err := testSweepReadDatabases(client, subId)
+		if err != nil {
+			return err
+		}
+
+		if !sweepSub {
+			continue
+		}
+
+		for _, db := range dbIds {
+			err := client.Database.Delete(context.TODO(), subId, db)
+			if err != nil {
+				return err
+			}
+		}
+
+		err = client.Subscription.Delete(context.TODO(), subId)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

internal/provider/utils.go

@@ -77,7 +77,6 @@ func (m *perIdLock) get(id int) *sync.Mutex {
 	return mutex
 }
 
-
 // IDs of any resources dependent on a subscription need to be divided by a slash. In this format: <sub id>/<resource id>.
 func buildResourceId(subId int, id int) string {
 	return fmt.Sprintf("%d/%d", subId, id)