Merge branch 'main' into feat/OPCR-19-disable-default-user-aa

Author: burythehammer

docs/resources/rediscloud_active_active_subscription.md

@@ -36,7 +36,6 @@ resource "rediscloud_active_active_subscription" "subscription-resource" {
   creation_plan {
     dataset_size_in_gb = 1
     quantity = 1
-    modules = ["RedisJSON"]
     region {
       region = "us-east-1"
       networking_deployment_cidr = "192.168.0.0/24"
@@ -61,12 +60,12 @@ The following arguments are supported:
 * `payment_method` (Optional) The payment method for the requested subscription, (either `credit-card` or `marketplace`). If `credit-card` is specified, `payment_method_id` must be defined. Default: 'credit-card'. **(Changes to) this attribute are ignored after creation.**
 * `payment_method_id` - (Optional) A valid payment method pre-defined in the current account. This value is __Optional__ for AWS/GCP Marketplace accounts, but __Required__ for all other account types
 * `cloud_provider` - (Optional) The cloud provider to use with the subscription, (either `AWS` or `GCP`). Default: ‘AWS’. **Modifying this attribute will force creation of a new resource.**
-* `redis_version` - (Optional) The Redis version of the databases in the subscription. If omitted, the Redis version will be the default. **Modifying this attribute will force creation of a new resource.**
+* `redis_version` - (Optional) The Redis version of the databases in the subscription. If omitted, the Redis version will be the default. **Deprecated: This attribute is deprecated on the subscription level. Please specify `redis_version` on databases directly instead.**
 * `creation_plan` - (Required) A creation plan object, documented below. Ignored after creation.
 * `maintenance_windows` - (Optional) The subscription's maintenance window specification, documented below.
 * `customer_managed_key_enabled` - (Optional) Whether to enable the CMK flow.
 * `customer_managed_key_deletion_grace_period` - (Optional) The grace period for deleting the subscription. If not set, will default to immediate deletion grace period.
-* `customer_managed_key` - (Optional) The customer managed keys (CMK) to use for this subscription. If is active-active subscription, must set a key for each region.
+* `customer_managed_key` - (Optional) The customer managed keys (CMK) to use for this subscription. In an active-active subscription, you must set a key for each region.
 
 The `creation_plan` block supports:
 

docs/resources/rediscloud_active_active_subscription_database.md

@@ -53,8 +53,6 @@ resource "rediscloud_active_active_subscription_database" "database-resource" {
       value = 1
     }
 
-    global_modules = ["RedisJSON"]
-
     override_region {
       name = "us-east-2"
       override_global_source_ips = ["192.10.0.0/16"]
@@ -90,6 +88,7 @@ output "us-east-2-private-endpoints" {
 The following arguments are supported:
 * `subscription_id`: (Required) The ID of the Active-Active subscription to create the database in. **Modifying this attribute will force creation of a new resource.**
 * `name` - (Required) A meaningful name to identify the database. **Modifying this attribute will force creation of a new resource.**
+* `redis_version` - (Optional) The Redis version of the database. If omitted, the Redis version will be the default.  **Modifying this attribute will force creation of a new resource.**
 * `memory_limit_in_gb` - (Optional -  **Required if `dataset_size_in_gb` is unset**) Maximum memory usage for this specific database, including replication and other overhead **Deprecated in favor of `dataset_size_in_gb` - not possible to import databases with this attribute set**
 * `dataset_size_in_gb` - (Optional - **Required if `memory_limit_in_gb` is unset**) The maximum amount of data in the dataset for this specific database is in GB
 * `support_oss_cluster_api` - (Optional) Support Redis open-source (OSS) Cluster API. Default: ‘false’

docs/resources/rediscloud_active_active_subscription_regions.md

@@ -30,7 +30,6 @@ resource "rediscloud_active_active_subscription_regions" "regions-resource" {
 	region {
 	  region = "us-east-2"
 	  networking_deployment_cidr = "10.0.1.0/24"
-    local_resp_version = "resp2"
 	  database {
 		  database_id = rediscloud_active_active_subscription_database.database-resource.db_id
       database_name = rediscloud_active_active_subscription_database.database-resource.name

docs/resources/rediscloud_subscription.md

@@ -33,7 +33,6 @@ resource "rediscloud_subscription" "subscription-resource" {
   name              = "subscription-name"
   payment_method    = "credit-card"
   payment_method_id = data.rediscloud_payment_method.card.id
-  memory_storage    = "ram"
 
   cloud_provider {
     provider = data.rediscloud_cloud_account.account.provider_type
@@ -53,7 +52,6 @@ resource "rediscloud_subscription" "subscription-resource" {
     replication                  = true
     throughput_measurement_by    = "operations-per-second"
     throughput_measurement_value = 20000
-    modules                      = ["RedisJSON"]
   }
   
   maintenance_windows {
@@ -75,14 +73,14 @@ The following arguments are supported:
 * `payment_method` (Optional) The payment method for the requested subscription, (either `credit-card` or `marketplace`). If `credit-card` is specified, `payment_method_id` must be defined. Default: 'credit-card'. **(Changes to) this attribute are ignored after creation.**
 * `payment_method_id` - (Optional) A valid payment method pre-defined in the current account. Only __Required__ when `payment_method` is `credit-card`.
 * `memory_storage` - (Optional) Memory storage preference: either ‘ram’ or a combination of ‘ram-and-flash’. Default: ‘ram’. **Modifying this attribute will force creation of a new resource.**
-* `redis_version` - (Optional) The Redis version of the databases in the subscription. If omitted, the Redis version will be the default.  **Deprecated: This attribute is deprecated on pro subscriptions. Please specify `redis_version` on databases directly instead.**
+* `redis_version` - (Optional) The Redis version of the databases in the subscription. If omitted, the Redis version will be the default.  **Deprecated: This attribute is deprecated on the subscriptions level. Please specify `redis_version` on databases directly instead.**
 * `allowlist` - (Optional) An allowlist object, documented below
 * `cloud_provider` - (Required) A cloud provider object, documented below. **Modifying this attribute will force creation of a new resource.**
 * `creation_plan` - (Required) A creation plan object, documented below.
 * `maintenance_windows` - (Optional) The subscription's maintenance window specification, documented below.
 * `customer_managed_key_enabled` - (Optional) Whether to enable the customer managed encryption key flow.
 * `customer_managed_key_deletion_grace_period` - (Optional) The grace period for deleting the subscription. If not set, will default to immediate deletion grace period.
-* `customer_managed_key` - (Optional) The customer managed keys (CMK) to use for this subscription. If is active-active subscription, must set a key for each region.
+* `customer_managed_key` - (Optional) The customer managed keys (CMK) to use for this subscription.
 
 The `allowlist` block supports:
 

docs/resources/rediscloud_subscription_database.md

@@ -23,7 +23,6 @@ resource "rediscloud_subscription" "subscription-resource" {
   name = "subscription-name"
   payment_method = "credit-card"
   payment_method_id = data.rediscloud_payment_method.card.id
-  memory_storage = "ram"
 
   cloud_provider {
     provider = data.rediscloud_cloud_account.account.provider_type
@@ -43,7 +42,6 @@ resource "rediscloud_subscription" "subscription-resource" {
     replication=true
     throughput_measurement_by = "operations-per-second"
     throughput_measurement_value = 20000
-    modules = ["RedisJSON"]
   }
 }
 
@@ -56,12 +54,6 @@ resource "rediscloud_subscription_database" "database-resource" {
     throughput_measurement_by = "operations-per-second"
     throughput_measurement_value = 20000
     replication = true
-  
-    modules = [
-        {
-          name = "RedisJSON"
-        }
-    ]
     
     alert {
       name = "dataset-size"