Merge pull request #615 from RedisLabs/develop

New release: 2.1.2

Author: burythehammer

.github/workflows/terraform_provider_pr.yml

@@ -149,6 +149,19 @@ jobs:
           go-version-file: go.mod
       - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloud(PrivateServiceConnect_CRUDI|AclRule_CRUDI)"'
 
+  # TODO: remove this after release
+  # qpf = query performance factor
+  go_test_smoke_qpf:
+    name: go test smoke qpf
+    needs: [ go_build ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+        with:
+          go-version-file: go.mod
+      - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloudProDatabase_qpf.*"'
+
   tfproviderlint:
     name: tfproviderlint
     needs: [go_build]

docs/data-sources/rediscloud_private_service_connect_endpoints.md

@@ -39,7 +39,7 @@ The `endpoints` object has these attributes:
 * `gcp_vpc_subnet_name` - The GCP Subnet name
 * `endpoint_connection_name` - The endpoint connection name
 * `status` - The endpoint status
-* `service_attachments` - The 40 service attachments that are created for the Private Service Connect endpoint, documented below
+* `service_attachments` - The service attachments that are created for the Private Service Connect endpoint, documented below
 
 The `service_attachments` object has these attributes:
 

docs/guides/migration-guide-v1.0.0.md

@@ -70,7 +70,7 @@ resource "rediscloud_subscription" "example" {
 
     alert {
       name  = "dataset-size"
-      value = 40
+      value = 1
     }
   }
 }
@@ -132,7 +132,7 @@ To use the latest schema, you need to modify the `rediscloud_subscription` resou
   
       alert {
         name = "dataset-size"
-        value = 40
+        value = 1
       }
   }
   ```

docs/resources/rediscloud_active_active_private_service_connect_endpoint.md

@@ -79,7 +79,7 @@ resource "rediscloud_active_active_subscription_regions" "regions" {
 }
 
 locals {
-  service_attachment_count = 40 # Each rediscloud_active_active_private_service_connect_endpoint will have exactly 40 service attachments
+  service_attachment_count = 1 # Each rediscloud_active_active_private_service_connect_endpoint will have exactly 1 service attachment
   region_id                = one([for r in rediscloud_active_active_subscription_regions.regions.region : r.region_id if r.region == var.gcp_region])
 }
 

docs/resources/rediscloud_active_active_subscription_database.md

@@ -50,7 +50,7 @@ resource "rediscloud_active_active_subscription_database" "database-resource" {
     global_source_ips = ["192.168.0.0/16"]
     global_alert {
       name = "dataset-size"
-      value = 40
+      value = 1
     }
 
     global_modules = ["RedisJSON"]
@@ -161,4 +161,4 @@ To update an existing configuration for a database which uses the `memory_limit_
 $ terraform state rm rediscloud_active_active_subscription_database.database-resource
 (Update the configuration to use `dataset_size_in_gb` instead of `memory_limit_in_gb`)
 $ terraform import rediscloud_active_active_subscription_database.database-resource 123456/12345678
-```
+```

docs/resources/rediscloud_private_service_connect_endpoint.md

@@ -43,7 +43,7 @@ resource "rediscloud_subscription" "subscription" {
 }
 
 locals {
-  service_attachment_count = 40 # Each rediscloud_private_service_connect_endpoint will have exactly 40 service attachments
+  service_attachment_count = 1 # Each rediscloud_private_service_connect_endpoint will have exactly 1 service attachment
 }
 
 resource "rediscloud_private_service_connect" "service" {
@@ -195,7 +195,7 @@ module "private_service_connect" {
 ## Attribute Reference
 
 * `private_service_connect_endpoint_id` - The ID of the Private Service Connect Endpoint
-* `service_attachments` - The 40 service attachments that are created for the Private Service Connect endpoint, documented below
+* `service_attachments` - The service attachment that is created for the Private Service Connect endpoint, documented below
 
 The `service_attachments` object has these attributes:
 

docs/resources/rediscloud_subscription_database.md

@@ -65,7 +65,7 @@ resource "rediscloud_subscription_database" "database-resource" {
     
     alert {
       name = "dataset-size"
-      value = 40
+      value = 1
     }
   
     tags = {
@@ -171,4 +171,4 @@ To update an existing configuration for a database which uses the `memory_limit_
 $ terraform state rm rediscloud_subscription_database.database-resource
 (Update the configuration to use `dataset_size_in_gb` instead of `memory_limit_in_gb`)
 $ terraform import rediscloud_subscription_database.database-resource 123456/12345678
-```
+```

provider/datasource_rediscloud_pro_database.go

@@ -59,6 +59,11 @@ func dataSourceRedisCloudProDatabase() *schema.Resource {
 				Type:        schema.TypeFloat,
 				Computed:    true,
 			},
+			"query_performance_factor": {
+				Description: "Query performance factor for this specific database",
+				Type:        schema.TypeString,
+				Computed:    true,
+			},
 			"support_oss_cluster_api": {
 				Description: "Supports the Redis open-source (OSS) Cluster API",
 				Type:        schema.TypeBool,
@@ -476,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

@@ -43,6 +43,7 @@ func TestAccDataSourceRedisCloudProDatabase_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(dataSourceById, "public_endpoint"),
 					resource.TestCheckResourceAttrSet(dataSourceById, "private_endpoint"),
 					resource.TestCheckResourceAttr(dataSourceById, "enable_default_user", "true"),
+					resource.TestCheckResourceAttr(dataSourceById, "query_performance_factor", "2x"),
 
 					resource.TestCheckResourceAttr(dataSourceByName, "name", "tf-database"),
 					resource.TestCheckResourceAttr(dataSourceByName, "protocol", "redis"),
@@ -59,6 +60,7 @@ func TestAccDataSourceRedisCloudProDatabase_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(dataSourceByName, "public_endpoint"),
 					resource.TestCheckResourceAttrSet(dataSourceByName, "private_endpoint"),
 					resource.TestCheckResourceAttr(dataSourceByName, "enable_default_user", "true"),
+					resource.TestCheckResourceAttr(dataSourceByName, "query_performance_factor", "2x"),
 				),
 			},
 		},
@@ -94,6 +96,8 @@ 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"]
   }
 }
 resource "rediscloud_subscription_database" "example" {
@@ -108,6 +112,12 @@ resource "rediscloud_subscription_database" "example" {
 	support_oss_cluster_api	     = true
 	replication				     = false
     enable_default_user 		 = true
+	query_performance_factor	 = "2x"
+	modules = [
+		{
+			name: "RediSearch"
+		}
+	]
 }
 
 data "rediscloud_database" "example-by-id" {

provider/datasource_rediscloud_pro_subscription_test.go

@@ -167,7 +167,7 @@ resource "rediscloud_active_active_subscription_database" "example" {
     global_source_ips = ["192.168.0.0/16", "192.170.0.0/16"]
     global_alert {
 		name = "dataset-size"
-		value = 40
+		value = 1
 	}
 	override_region {
 		name = "us-east-1"