Udpates to validate QPF range value

Author: trentrosenbaum

provider/resource_rediscloud_pro_database.go

@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -221,6 +222,18 @@ func resourceRedisCloudProDatabase() *schema.Resource {
 				Optional:    true,
 				Computed:    true,
 				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)
+					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))
+					}
+					return
+				},
 			},
 			"modules": {
 				Description: "Modules to be provisioned in the database",

provider/resource_rediscloud_pro_database_qpf_test.go

@@ -161,3 +161,23 @@ func TestAccResourceRedisCloudProDatabase_missingRediSearchModule(t *testing.T)
 
 	testErrorCase(t, config, regexp.MustCompile("query_performance_factor\" requires the \"modules\" list to contain \"RediSearch"))
 }
+
+func TestAccResourceRedisCloudProDatabase_invalidQueryPerformanceFactors(t *testing.T) {
+	name := acctest.RandomWithPrefix("tf-test")
+	password := acctest.RandString(20)
+	testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME")
+
+	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`))
+}
+
+func TestAccResourceRedisCloudProDatabase_invalidQueryPerformanceFactors_outOfRange(t *testing.T) {
+	name := acctest.RandomWithPrefix("tf-test")
+	password := acctest.RandString(20)
+	testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME")
+
+	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`))
+}

provider/resource_rediscloud_pro_subscription_qpf_test.go

@@ -128,7 +128,7 @@ func TestAccResourceRedisCloudProSubscription_missingRediSearchModule(t *testing
 	testSubErrorCase(t, config, regexp.MustCompile("query_performance_factor\" requires the \"modules\" list to contain \"RediSearch"))
 }
 
-func TestAccRedisCloudDatabase_invalidQueryPerformanceFactors(t *testing.T) {
+func TestAccResourceRedisCloudProSubscription_invalidQueryPerformanceFactors(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-test")
 	password := acctest.RandString(20)
 	testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME")
@@ -138,7 +138,7 @@ func TestAccRedisCloudDatabase_invalidQueryPerformanceFactors(t *testing.T) {
 	testSubErrorCase(t, config, regexp.MustCompile(`"creation_plan\.0\.query_performance_factor" must be an even value between 2x and 16x \(inclusive\), got: 5x`))
 }
 
-func TestAccRedisCloudDatabase_invalidQueryPerformanceFactors_outOfRange(t *testing.T) {
+func TestAccResourceRedisCloudProSubscription_invalidQueryPerformanceFactors_outOfRange(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-test")
 	password := acctest.RandString(20)
 	testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME")