Deleted some dud tests and fixed a datasource bug

RedisLabs · May 14, 2024 · 462806a · 462806a
1 parent 868c267
commit 462806a
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 2,127 deletions.
diff --git a/provider/datasource_rediscloud_active_active_subscription.go b/provider/datasource_rediscloud_active_active_subscription.go
@@ -30,6 +30,16 @@ func dataSourceRedisCloudActiveActiveSubscription() *schema.Resource {
 				Type:        schema.TypeString,
 				Computed:    true,
 			},
+			"number_of_databases": {
+				Description: "The number of databases that are linked to this subscription",
+				Type:        schema.TypeInt,
+				Computed:    true,
+			},
+			"status": {
+				Description: "Current status of the subscription",
+				Type:        schema.TypeString,
+				Computed:    true,
+			},
 			"cloud_provider": {
 				Description: "A cloud provider string either GCP or AWS",
 				Type:        schema.TypeString,
@@ -141,6 +151,12 @@ func dataSourceRedisCloudActiveActiveSubscriptionRead(ctx context.Context, d *sc
 	if err := d.Set("payment_method", sub.PaymentMethod); err != nil {
 		return diag.FromErr(err)
 	}
+	if err := d.Set("number_of_databases", redis.IntValue(sub.NumberOfDatabases)); err != nil {
+		return diag.FromErr(err)
+	}
+	if err := d.Set("status", redis.StringValue(sub.Status)); err != nil {
+		return diag.FromErr(err)
+	}
 
 	cloudDetails := sub.CloudDetails
 	if len(cloudDetails) == 0 {
@@ -155,13 +171,6 @@ func dataSourceRedisCloudActiveActiveSubscriptionRead(ctx context.Context, d *sc
 		}
 	}
 
-	if err := d.Set("number_of_databases", redis.IntValue(sub.NumberOfDatabases)); err != nil {
-		return diag.FromErr(err)
-	}
-	if err := d.Set("status", redis.StringValue(sub.Status)); err != nil {
-		return diag.FromErr(err)
-	}
-
 	subId := redis.IntValue(sub.ID)
 
 	pricingList, err := api.client.Pricing.List(ctx, subId)

diff --git a/provider/datasource_rediscloud_database_test.go b/provider/datasource_rediscloud_database_test.go
diff --git a/provider/datasource_rediscloud_subscription_peerings_test.go b/provider/datasource_rediscloud_subscription_peerings_test.go
@@ -36,7 +36,7 @@ func TestAccDataSourceRedisCloudSubscriptionPeerings_basic(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t); testAccAwsPeeringPreCheck(t); testAccAwsPreExistingCloudAccountPreCheck(t) },
 		ProviderFactories: providerFactories,
-		CheckDestroy:      testAccCheckSubscriptionDestroy,
+		CheckDestroy:      testAccCheckFlexibleSubscriptionDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: tf,

diff --git a/provider/datasource_rediscloud_subscription_test.go b/provider/datasource_rediscloud_subscription_test.go
diff --git a/provider/rediscloud_active_active_database_test.go b/provider/rediscloud_active_active_database_test.go
@@ -225,7 +225,7 @@ func TestAccResourceRedisCloudActiveActiveDatabase_timeUtcRequiresValidInterval(
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t); testAccAwsPreExistingCloudAccountPreCheck(t) },
 		ProviderFactories: providerFactories,
-		CheckDestroy:      testAccCheckSubscriptionDestroy,
+		CheckDestroy:      testAccCheckActiveActiveSubscriptionDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config:      fmt.Sprintf(testAccResourceRedisCloudActiveActiveDatabaseInvalidTimeUtc, testCloudAccountName, name, password),