test: updating test for upgrade of redis8 and fixing issues

Author: burythehammer

provider/pro/resource_rediscloud_pro_database.go

@@ -542,8 +542,21 @@ func resourceRedisCloudProDatabaseRead(ctx context.Context, d *schema.ResourceDa
 		return diag.FromErr(err)
 	}
 
-	if err := d.Set("modules", FlattenModules(db.Modules)); err != nil {
-		return diag.FromErr(err)
+	// For Redis 8.0+, modules are bundled by default and returned by the API
+	// Only set modules in state if they were explicitly defined in the config
+	redisVersion := redis.StringValue(db.RedisVersion)
+	if redisVersion >= "8.0" {
+		// Only set modules if they were explicitly configured by the user
+		if _, ok := d.GetOk("modules"); ok {
+			if err := d.Set("modules", FlattenModules(db.Modules)); err != nil {
+				return diag.FromErr(err)
+			}
+		}
+	} else {
+		// For Redis < 8.0, always set modules from API response
+		if err := d.Set("modules", FlattenModules(db.Modules)); err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	if err := d.Set("alert", FlattenAlerts(db.Alerts)); err != nil {
@@ -841,12 +854,16 @@ func upgradeRedisVersion(ctx context.Context, api *client.ApiClient, subId int,
 
 	log.Printf("[INFO] Redis version change request to %s accepted by API", newVersion)
 
-	// wait for upgrade
 	if err := utils.WaitForDatabaseToBeActive(ctx, subId, dbId, api); err != nil {
 		utils.SubscriptionMutex.Unlock(subId)
 		return diag.FromErr(err), true
 	}
 
+	if err := utils.WaitForSubscriptionToBeActive(ctx, subId, api); err != nil {
+		utils.SubscriptionMutex.Unlock(subId)
+		return diag.FromErr(err), true
+	}
+
 	return nil, false
 }
 

provider/pro/testdata/pro_database_redis_8_update.tf renamed to provider/pro/testdata/pro_database_redis_7.tf

@@ -1,6 +1,7 @@
 locals {
   rediscloud_cloud_account = "%s"
   rediscloud_subscription_name = "%s"
+  rediscloud_database_password = "%s"
 }
 
 data "rediscloud_payment_method" "card" {
@@ -53,7 +54,7 @@ resource "rediscloud_subscription_database" "example" {
   client_ssl_certificate                = ""
   periodic_backup_path                  = ""
   enable_default_user                   = true
-  redis_version                         = "8.0"
+  redis_version                         = "7.2"
 
   alert {
     name  = "dataset-size"

provider/pro/testdata/pro_database_redis_8.tf

@@ -54,7 +54,7 @@ resource "rediscloud_subscription_database" "example" {
   client_ssl_certificate                = ""
   periodic_backup_path                  = ""
   enable_default_user                   = true
-  redis_version                         = "7.2"
+  redis_version                         = "8.0"
 
   alert {
     name  = "dataset-size"

provider/resource_rediscloud_pro_database_redis_8_test.go

@@ -16,8 +16,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-// Checks CRUDI (CREATE, READ, UPDATE, IMPORT) operations on the database resource with Redis 8.
-func TestAccResourceRedisCloudProDatabase_Redis8_CRUDI(t *testing.T) {
+// checks that a redis 8 database can be provisioned
+func TestAccResourceRedisCloudProDatabase_Redis8(t *testing.T) {
 
 	utils.AccRequiresEnvVar(t, "EXECUTE_TESTS")
 
@@ -34,9 +34,90 @@ func TestAccResourceRedisCloudProDatabase_Redis8_CRUDI(t *testing.T) {
 		ProviderFactories: providerFactories,
 		CheckDestroy:      testAccCheckProSubscriptionDestroy,
 		Steps: []resource.TestStep{
-			// Test database and replica database creation with Redis 7.2
 			{
 				Config: getRedis8DatabaseConfig(t, testCloudAccountName, name, password),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "name", "example"),
+					resource.TestCheckResourceAttr(resourceName, "protocol", "redis"),
+					resource.TestCheckResourceAttr(resourceName, "dataset_size_in_gb", "3"),
+					resource.TestCheckResourceAttr(resourceName, "replication", "false"),
+					resource.TestCheckResourceAttr(resourceName, "support_oss_cluster_api", "false"),
+					resource.TestCheckResourceAttr(resourceName, "resp_version", "resp3"),
+					resource.TestCheckResourceAttr(resourceName, "throughput_measurement_by", "operations-per-second"),
+					resource.TestCheckResourceAttr(resourceName, "throughput_measurement_value", "1000"),
+					resource.TestCheckResourceAttr(resourceName, "data_persistence", "none"),
+					resource.TestCheckResourceAttr(resourceName, "data_eviction", "allkeys-random"),
+					resource.TestCheckResourceAttr(resourceName, "average_item_size_in_bytes", "0"),
+					resource.TestCheckResourceAttr(resourceName, "client_ssl_certificate", ""),
+					resource.TestCheckResourceAttr(resourceName, "periodic_backup_path", ""),
+					resource.TestCheckResourceAttr(resourceName, "external_endpoint_for_oss_cluster_api", "false"),
+					resource.TestCheckResourceAttr(resourceName, "password", password),
+					resource.TestCheckResourceAttr(resourceName, "alert.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "alert.0.name", "dataset-size"),
+					resource.TestCheckResourceAttr(resourceName, "alert.0.value", "1"),
+					resource.TestCheckResourceAttr(resourceName, "enable_default_user", "true"),
+					resource.TestCheckResourceAttr(resourceName, "redis_version", "8.0"),
+
+					resource.TestCheckResourceAttr(resourceName, "tags.market", "emea"),
+					resource.TestCheckResourceAttr(resourceName, "tags.material", "cardboard"),
+
+					// Test databases exist
+					func(s *terraform.State) error {
+						r := s.RootModule().Resources[subscriptionResourceName]
+
+						var err error
+						subId, err = strconv.Atoi(r.Primary.ID)
+						if err != nil {
+							return fmt.Errorf("couldn't parse the subscription ID: %s", redis.StringValue(&r.Primary.ID))
+						}
+
+						apiClient := testProvider.Meta().(*client.ApiClient)
+						sub, err := apiClient.Client.Subscription.Get(context.TODO(), subId)
+						if err != nil {
+							return err
+						}
+
+						if redis.StringValue(sub.Name) != name {
+							return fmt.Errorf("unexpected name value: %s", redis.StringValue(sub.Name))
+						}
+
+						listDb := apiClient.Client.Database.List(context.TODO(), subId)
+						if listDb.Next() != true {
+							return fmt.Errorf("no database found: %s", listDb.Err())
+						}
+						if listDb.Err() != nil {
+							return listDb.Err()
+						}
+
+						return nil
+					},
+				),
+			},
+		},
+	})
+}
+
+// Checks that users can upgrade from 7.2 to 8.0
+func TestAccResourceRedisCloudProDatabase_Redis8_Upgrade(t *testing.T) {
+
+	utils.AccRequiresEnvVar(t, "EXECUTE_TESTS")
+
+	name := acctest.RandomWithPrefix(testResourcePrefix)
+	password := acctest.RandString(20)
+	const resourceName = "rediscloud_subscription_database.example"
+	const subscriptionResourceName = "rediscloud_subscription.example"
+	testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME")
+
+	var subId int
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t); testAccAwsPreExistingCloudAccountPreCheck(t) },
+		ProviderFactories: providerFactories,
+		CheckDestroy:      testAccCheckProSubscriptionDestroy,
+		Steps: []resource.TestStep{
+			// Test database and replica database creation with Redis 7.2
+			{
+				Config: getRedis7DatabaseConfig(t, testCloudAccountName, name, password),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "name", "example"),
 					resource.TestCheckResourceAttr(resourceName, "protocol", "redis"),
@@ -96,7 +177,7 @@ func TestAccResourceRedisCloudProDatabase_Redis8_CRUDI(t *testing.T) {
 			},
 			// Test database is updated successfully to Redis 8.0
 			{
-				Config: getRedis8DatabaseUpdateConfig(t, testCloudAccountName, name, password),
+				Config: getRedis8DatabaseConfig(t, testCloudAccountName, name, password),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "redis_version", "8.0"),
 				),
@@ -126,13 +207,13 @@ func TestAccResourceRedisCloudProDatabase_Redis8_ModulesBlocked(t *testing.T) {
 	})
 }
 
-func getRedis8DatabaseConfig(t *testing.T, cloudAccountName, subscriptionName, password string) string {
-	content := utils.GetTestConfig(t, "./pro/testdata/pro_database_redis_8.tf")
+func getRedis7DatabaseConfig(t *testing.T, cloudAccountName, subscriptionName, password string) string {
+	content := utils.GetTestConfig(t, "./pro/testdata/pro_database_redis_7.tf")
 	return fmt.Sprintf(content, cloudAccountName, subscriptionName, password)
 }
 
-func getRedis8DatabaseUpdateConfig(t *testing.T, cloudAccountName, subscriptionName, password string) string {
-	content := utils.GetTestConfig(t, "./pro/testdata/pro_database_redis_8_update.tf")
+func getRedis8DatabaseConfig(t *testing.T, cloudAccountName, subscriptionName, password string) string {
+	content := utils.GetTestConfig(t, "./pro/testdata/pro_database_redis_8.tf")
 	return fmt.Sprintf(content, cloudAccountName, subscriptionName, password)
 }