Skip to content

Commit 0701340

Browse files
committed
fix: remove qpf module hardcoded validation
1 parent ebcec58 commit 0701340

File tree

2 files changed

+0
-51
lines changed

2 files changed

+0
-51
lines changed

provider/pro/resource_rediscloud_pro_subscription.go

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,6 @@ import (
2525

2626
const CMK_ENABLED_STRING = "customer-managed-key"
2727

28-
func containsModule(modules []interface{}, requiredModule string) bool {
29-
for _, m := range modules {
30-
if mod, ok := m.(string); ok && mod == requiredModule {
31-
return true
32-
}
33-
}
34-
return false
35-
}
36-
3728
func ResourceRedisCloudProSubscription() *schema.Resource {
3829
return &schema.Resource{
3930

@@ -48,28 +39,6 @@ func ResourceRedisCloudProSubscription() *schema.Resource {
4839
return nil
4940
}
5041

51-
// Validate "query_performance_factor" dependency on "modules"
52-
creationPlan := diff.Get("creation_plan").([]interface{})
53-
if len(creationPlan) > 0 {
54-
plan := creationPlan[0].(map[string]interface{})
55-
56-
qpf, qpfExists := plan["query_performance_factor"].(string)
57-
58-
// Ensure "modules" key is explicitly defined in HCL
59-
_, modulesExists := diff.GetOkExists("creation_plan.0.modules")
60-
61-
if qpfExists && qpf != "" {
62-
if !modulesExists {
63-
return fmt.Errorf(`"query_performance_factor" requires the "modules" key to be explicitly defined in HCL`)
64-
}
65-
66-
modules, _ := plan["modules"].([]interface{})
67-
if !containsModule(modules, "RediSearch") {
68-
return fmt.Errorf(`"query_performance_factor" requires the "modules" list to contain "RediSearch"`)
69-
}
70-
}
71-
}
72-
7342
err := cloudRegionsForceNewDiff(ctx, diff, meta)
7443
if err != nil {
7544
return err

provider/resource_rediscloud_pro_subscription_qpf_test.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -109,26 +109,6 @@ func TestAccResourceRedisCloudProSubscription_qpf(t *testing.T) {
109109
})
110110
}
111111

112-
func TestAccResourceRedisCloudProSubscription_missingModule(t *testing.T) {
113-
name := acctest.RandomWithPrefix(testResourcePrefix)
114-
password := acctest.RandString(20)
115-
testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME")
116-
117-
config := formatDatabaseConfig(name, testCloudAccountName, password, "4x", "")
118-
119-
testSubErrorCase(t, config, regexp.MustCompile("query_performance_factor\" requires the \"modules\" key to be explicitly defined in HCL"))
120-
}
121-
122-
func TestAccResourceRedisCloudProSubscription_missingRediSearchModule(t *testing.T) {
123-
name := acctest.RandomWithPrefix(testResourcePrefix)
124-
password := acctest.RandString(20)
125-
testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME")
126-
127-
config := formatDatabaseConfig(name, testCloudAccountName, password, "4x", `modules = [{ name = "RediBloom" }]`)
128-
129-
testSubErrorCase(t, config, regexp.MustCompile("query_performance_factor\" requires the \"modules\" list to contain \"RediSearch"))
130-
}
131-
132112
func TestAccResourceRedisCloudProSubscription_invalidQueryPerformanceFactors(t *testing.T) {
133113
name := acctest.RandomWithPrefix("tf-test")
134114
password := acctest.RandString(20)

0 commit comments

Comments
 (0)