Refined the QPF range to be 2x - 8x to match swagger api response

Author: trentrosenbaum

provider/resource_rediscloud_pro_database.go

@@ -224,13 +224,13 @@ func resourceRedisCloudProDatabase() *schema.Resource {
 				ForceNew:    true,
 				ValidateFunc: func(val interface{}, key string) (warns []string, errs []error) {
 					v := val.(string)
-					matched, err := regexp.MatchString(`^(2|4|6|8|10|12|14|16)x$`, v)
+					matched, err := regexp.MatchString(`^([2468])x$`, v)
 					if err != nil {
 						errs = append(errs, fmt.Errorf("regex match failed: %s", err))
 						return
 					}
 					if !matched {
-						errs = append(errs, fmt.Errorf("%q must be an even value between 2x and 16x (inclusive), got: %s", key, v))
+						errs = append(errs, fmt.Errorf("%q must be an even value between 2x and 8x (inclusive), got: %s", key, v))
 					}
 					return
 				},

provider/resource_rediscloud_pro_database_qpf_test.go

@@ -169,7 +169,7 @@ func TestAccResourceRedisCloudProDatabase_invalidQueryPerformanceFactors(t *test
 
 	config := formatDatabaseConfig(name, testCloudAccountName, password, "5x", `modules = [{ name = "RediSearch" }]`)
 
-	testSubErrorCase(t, config, regexp.MustCompile(`"creation_plan\.0\.query_performance_factor" must be an even value between 2x and 16x \(inclusive\), got: 5x`))
+	testSubErrorCase(t, config, regexp.MustCompile(`"creation_plan\.0\.query_performance_factor" must be an even value between 2x and 8x \(inclusive\), got: 5x`))
 }
 
 func TestAccResourceRedisCloudProDatabase_invalidQueryPerformanceFactors_outOfRange(t *testing.T) {
@@ -179,5 +179,5 @@ func TestAccResourceRedisCloudProDatabase_invalidQueryPerformanceFactors_outOfRa
 
 	config := formatDatabaseConfig(name, testCloudAccountName, password, "30x", `modules = [{ name = "RediSearch" }]`)
 
-	testSubErrorCase(t, config, regexp.MustCompile(`"creation_plan\.0\.query_performance_factor" must be an even value between 2x and 16x \(inclusive\), got: 30x`))
+	testSubErrorCase(t, config, regexp.MustCompile(`"creation_plan\.0\.query_performance_factor" must be an even value between 2x and 8x \(inclusive\), got: 30x`))
 }

provider/resource_rediscloud_pro_subscription.go

@@ -296,13 +296,13 @@ func resourceRedisCloudProSubscription() *schema.Resource {
 							Computed:    true,
 							ValidateFunc: func(val interface{}, key string) (warns []string, errs []error) {
 								v := val.(string)
-								matched, err := regexp.MatchString(`^(2|4|6|8|10|12|14|16)x$`, v)
+								matched, err := regexp.MatchString(`^([2468])x$`, v)
 								if err != nil {
 									errs = append(errs, fmt.Errorf("regex match failed: %s", err))
 									return
 								}
 								if !matched {
-									errs = append(errs, fmt.Errorf("%q must be an even value between 2x and 16x (inclusive), got: %s", key, v))
+									errs = append(errs, fmt.Errorf("%q must be an even value between 2x and 8x (inclusive), got: %s", key, v))
 								}
 								return
 							},

provider/resource_rediscloud_pro_subscription_qpf_test.go

@@ -135,7 +135,7 @@ func TestAccResourceRedisCloudProSubscription_invalidQueryPerformanceFactors(t *
 
 	config := formatDatabaseConfig(name, testCloudAccountName, password, "5x", `modules = [{ name = "RediSearch" }]`)
 
-	testSubErrorCase(t, config, regexp.MustCompile(`"creation_plan\.0\.query_performance_factor" must be an even value between 2x and 16x \(inclusive\), got: 5x`))
+	testSubErrorCase(t, config, regexp.MustCompile(`"creation_plan\.0\.query_performance_factor" must be an even value between 2x and 8x \(inclusive\), got: 5x`))
 }
 
 func TestAccResourceRedisCloudProSubscription_invalidQueryPerformanceFactors_outOfRange(t *testing.T) {
@@ -145,5 +145,5 @@ func TestAccResourceRedisCloudProSubscription_invalidQueryPerformanceFactors_out
 
 	config := formatDatabaseConfig(name, testCloudAccountName, password, "30x", `modules = [{ name = "RediSearch" }]`)
 
-	testSubErrorCase(t, config, regexp.MustCompile(`"creation_plan\.0\.query_performance_factor" must be an even value between 2x and 16x \(inclusive\), got: 30x`))
+	testSubErrorCase(t, config, regexp.MustCompile(`"creation_plan\.0\.query_performance_factor" must be an even value between 2x and 8x \(inclusive\), got: 30x`))
 }