Skip to content

Commit d1d38e0

Browse files
Reverts AA subs to not use query_performance_factor as not supported
1 parent 5472b4c commit d1d38e0

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

provider/rediscloud_active_active_subscription_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ func TestAccResourceRedisCloudActiveActiveSubscription_CRUDI(t *testing.T) {
4343
resource.TestCheckResourceAttr(resourceName, "cloud_provider", "AWS"),
4444
resource.TestCheckResourceAttr(resourceName, "creation_plan.#", "1"),
4545
resource.TestCheckResourceAttr(resourceName, "creation_plan.0.memory_limit_in_gb", "1"),
46-
resource.TestCheckResourceAttr(resourceName, "creation_plan.0.query_performance_factor", "4x"),
4746
resource.TestCheckResourceAttr(resourceName, "creation_plan.0.quantity", "1"),
4847
resource.TestCheckResourceAttr(resourceName, "creation_plan.0.modules.#", "1"),
4948
resource.TestCheckResourceAttr(resourceName, "creation_plan.0.modules.0", "RedisJSON"),
@@ -169,7 +168,6 @@ func TestAccResourceRedisCloudActiveActiveSubscription_CRUDI(t *testing.T) {
169168
resource.TestCheckResourceAttr(resourceName, "cloud_provider", "AWS"),
170169
resource.TestCheckResourceAttr(resourceName, "creation_plan.#", "1"),
171170
resource.TestCheckResourceAttr(resourceName, "creation_plan.0.memory_limit_in_gb", "1"),
172-
resource.TestCheckResourceAttr(resourceName, "creation_plan.0.query_performance_factor", "4x"),
173171
resource.TestCheckResourceAttr(resourceName, "creation_plan.0.quantity", "1"),
174172
resource.TestCheckResourceAttr(resourceName, "creation_plan.0.modules.#", "1"),
175173
resource.TestCheckResourceAttr(resourceName, "creation_plan.0.modules.0", "RedisJSON"),
@@ -337,7 +335,6 @@ resource "rediscloud_active_active_subscription" "example" {
337335
338336
creation_plan {
339337
memory_limit_in_gb = 1
340-
query_performance_factor = "2x"
341338
modules = ["RedisJSON"]
342339
quantity = 1
343340
region {

provider/resource_rediscloud_active_active_subscription.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,6 @@ func resourceRedisCloudActiveActiveSubscription() *schema.Resource {
112112
Optional: true,
113113
ConflictsWith: []string{"creation_plan.0.memory_limit_in_gb"},
114114
},
115-
"query_performance_factor": {
116-
Description: "Query performance factor for this specific database",
117-
Type: schema.TypeString,
118-
Optional: true,
119-
},
120115
"quantity": {
121116
Description: "The planned number of databases",
122117
Type: schema.TypeInt,
@@ -652,16 +647,14 @@ func buildSubscriptionCreatePlanAADatabases(planMap map[string]interface{}) []*s
652647
createModules = append(createModules, createModule)
653648
}
654649

655-
queryPerformanceFactor := planMap["queryPerformanceFactor"].(string)
656-
657650
// create the remaining DBs with all other modules
658-
createDatabases = append(createDatabases, createAADatabase(dbName, &idx, localThroughputs, numDatabases, memoryLimitInGB, datasetSizeInGB, createModules, queryPerformanceFactor)...)
651+
createDatabases = append(createDatabases, createAADatabase(dbName, &idx, localThroughputs, numDatabases, memoryLimitInGB, datasetSizeInGB, createModules)...)
659652

660653
return createDatabases
661654
}
662655

663656
// createDatabase returns a CreateDatabase struct with the given parameters
664-
func createAADatabase(dbName string, idx *int, localThroughputs []*subscriptions.CreateLocalThroughput, numDatabases int, memoryLimitInGB float64, datasetSizeInGB float64, modules []*subscriptions.CreateModules, queryPerformanceFactor string) []*subscriptions.CreateDatabase {
657+
func createAADatabase(dbName string, idx *int, localThroughputs []*subscriptions.CreateLocalThroughput, numDatabases int, memoryLimitInGB float64, datasetSizeInGB float64, modules []*subscriptions.CreateModules) []*subscriptions.CreateDatabase {
665658
var dbs []*subscriptions.CreateDatabase
666659
for i := 0; i < numDatabases; i++ {
667660
createDatabase := subscriptions.CreateDatabase{
@@ -670,7 +663,6 @@ func createAADatabase(dbName string, idx *int, localThroughputs []*subscriptions
670663
LocalThroughputMeasurement: localThroughputs,
671664
Quantity: redis.Int(1),
672665
Modules: modules,
673-
QueryPerformanceFactor: redis.String(queryPerformanceFactor),
674666
}
675667
if datasetSizeInGB > 0 {
676668
createDatabase.DatasetSizeInGB = redis.Float64(datasetSizeInGB)

0 commit comments

Comments
 (0)