Updates datasource and resources to handle QPF

Author: trentrosenbaum

provider/datasource_rediscloud_pro_database.go

@@ -62,7 +62,6 @@ func dataSourceRedisCloudProDatabase() *schema.Resource {
 			"query_performance_factor": {
 				Description: "Query performance factor for this specific database",
 				Type:        schema.TypeString,
-				Optional:    true,
 				Computed:    true,
 			},
 			"support_oss_cluster_api": {
@@ -482,6 +481,10 @@ func dataSourceRedisCloudProDatabaseRead(ctx context.Context, d *schema.Resource
 		return diag.FromErr(err)
 	}
 
+	if err := d.Set("query_performance_factor", redis.String(*db.QueryPerformanceFactor)); err != nil {
+		return diag.FromErr(err)
+	}
+
 	return diags
 }
 

provider/datasource_rediscloud_pro_database_test.go

@@ -96,6 +96,7 @@ resource "rediscloud_subscription" "example" {
     support_oss_cluster_api=true
     throughput_measurement_by = "operations-per-second"
     throughput_measurement_value = 1000
+	query_performance_factor	 = "2x"
 	modules = ["RediSearch"]
   }
 }

provider/resource_rediscloud_pro_database.go

@@ -391,10 +391,13 @@ func resourceRedisCloudProDatabaseCreate(ctx context.Context, d *schema.Resource
 			By:    redis.String(throughputMeasurementBy),
 			Value: redis.Int(throughputMeasurementValue),
 		},
-		Modules:                createModules,
-		Alerts:                 createAlerts,
-		RemoteBackup:           buildBackupPlan(d.Get("remote_backup").([]interface{}), d.Get("periodic_backup_path")),
-		QueryPerformanceFactor: redis.String(queryPerformanceFactor),
+		Modules:      createModules,
+		Alerts:       createAlerts,
+		RemoteBackup: buildBackupPlan(d.Get("remote_backup").([]interface{}), d.Get("periodic_backup_path")),
+	}
+
+	if queryPerformanceFactor != "" {
+		createDatabase.QueryPerformanceFactor = redis.String(queryPerformanceFactor)
 	}
 
 	if password != "" {
@@ -597,11 +600,10 @@ func resourceRedisCloudProDatabaseRead(ctx context.Context, d *schema.ResourceDa
 	if err := d.Set("remote_backup", flattenBackupPlan(db.Backup, d.Get("remote_backup").([]interface{}), d.Get("periodic_backup_path").(string))); err != nil {
 		return diag.FromErr(err)
 	}
-
-	////query_performance_factor
-	//if err := d.Set("query_performance_factor", redis.String(*db.)); err != nil {
-	//	return diag.FromErr(err)
-	//}
+	
+	if err := d.Set("query_performance_factor", redis.String(*db.QueryPerformanceFactor)); err != nil {
+		return diag.FromErr(err)
+	}
 
 	if err := readTags(ctx, api, subId, dbId, d); err != nil {
 		return diag.FromErr(err)
@@ -677,13 +679,12 @@ func resourceRedisCloudProDatabaseUpdate(ctx context.Context, d *schema.Resource
 			By:    redis.String(d.Get("throughput_measurement_by").(string)),
 			Value: redis.Int(d.Get("throughput_measurement_value").(int)),
 		},
-		DataPersistence:        redis.String(d.Get("data_persistence").(string)),
-		DataEvictionPolicy:     redis.String(d.Get("data_eviction").(string)),
-		SourceIP:               setToStringSlice(d.Get("source_ips").(*schema.Set)),
-		Alerts:                 &alerts,
-		RemoteBackup:           buildBackupPlan(d.Get("remote_backup").([]interface{}), d.Get("periodic_backup_path")),
-		EnableDefaultUser:      redis.Bool(d.Get("enable_default_user").(bool)),
-		QueryPerformanceFactor: redis.String(d.Get("query_performance_factor").(string)),
+		DataPersistence:    redis.String(d.Get("data_persistence").(string)),
+		DataEvictionPolicy: redis.String(d.Get("data_eviction").(string)),
+		SourceIP:           setToStringSlice(d.Get("source_ips").(*schema.Set)),
+		Alerts:             &alerts,
+		RemoteBackup:       buildBackupPlan(d.Get("remote_backup").([]interface{}), d.Get("periodic_backup_path")),
+		EnableDefaultUser:  redis.Bool(d.Get("enable_default_user").(bool)),
 	}
 
 	// One of the following fields must be set, validation is handled in the schema (ExactlyOneOf)
@@ -700,6 +701,11 @@ func resourceRedisCloudProDatabaseUpdate(ctx context.Context, d *schema.Resource
 		update.SourceIP = []*string{redis.String("0.0.0.0/0")}
 	}
 
+	queryPerformanceFactor := d.Get("query_performance_factor").(string)
+	if queryPerformanceFactor != "" {
+		update.QueryPerformanceFactor = redis.String(queryPerformanceFactor)
+	}
+
 	if d.Get("password").(string) != "" {
 		update.Password = redis.String(d.Get("password").(string))
 	}