Merge branch 'main' into NoamSternRedis-patch-2

Author: burythehammer

CHANGELOG.md

@@ -4,15 +4,27 @@ All notable changes to this project will be documented in this file.
 See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
 
 
-# 2.4.0 (18th September 2025)
+# 2.4.1 (24rd September 2025)
+
+### Added
+
+- AWS PrivateLink support for Active Active subscriptions.
+- New resource: `rediscloud_active_active_private_link`
+- New data source: `rediscloud_active_active_private_link`
+- New data source: `rediscloud_active_active_private_link_endpoint_script`
+
+### Changed:
+
+- `rediscloud_active_active_subscription_regions` now supports the property `region_id`
+
+# 2.4.0 (19th September 2025)
 
 ### Added
 
 - AWS PrivateLink support for Pro Subscriptions.
 - New resource: `rediscloud_private_link` which allows users to manage peering between Redis Subscriptions and AWS resources.
-- New data source: `rediscloud_private_link` which allows users to fetch information about Redis Subscriptions.
-- 
-
+- New data source: `rediscloud_private_link` 
+- New data source: `rediscloud_private_link_endpoint_script`
 
 # 2.3.0 (19th August 2025)
 

docs/data-sources/rediscloud_active_active_private_link.md

@@ -0,0 +1,53 @@
+---
+layout: "rediscloud"
+page_title: "Redis Cloud: rediscloud_private_link"
+description: |-
+  PrivateLink data source for Pro Subscription in the Redis Cloud Terraform provider.
+---
+
+# Data Source: rediscloud_active_active_private_link
+The PrivateLink data source allows the user to retrieve information about an existing PrivateLink for an Active Active Subscription in the provider.
+
+## Example Usage
+
+```hcl
+data "rediscloud_active_active_private_link" "example" {
+  subscription_id = "1234"
+  region_id = 1
+}
+
+output "rediscloud_private_link_principals" {
+  value = data.rediscloud_active_active_private_link.example.principals
+}
+```
+
+## Argument Reference
+
+* `subscription_id` - (Required) The ID of the Active Active Subscription the PrivateLink is attached to.
+* `region_id` - (Required) The region ID within the Active Active subscription that the PrivateLink is attached to.
+
+## Attribute reference
+
+* `principals` - The principal(s) attached to the PrivateLink.
+* `resource_configuration_id` - ID of the resource configuration to attach to this PrivateLink
+* `resource_configuration_arn` - ARN of the resource configuration to attach to this PrivateLink
+* `share_arn` - Share ARN of this PrivateLink.
+* `connections` - List of connections associated with the PrivateLink.
+* `databases` - List of databases associated with the PrivateLink.
+
+The `principals` object is a list, with these attributes:
+* `principal` - The principal attached to this PrivateLink.
+* `principal_type` - The principal type.
+* `principal_alias` - The friendly name to refer to the principal.
+
+The `connections` object is a list, with these attributes:
+* `association_id` - Association ID of the PrivateLink connection.
+* `connection_id` - Connection ID of the PrivateLink connection
+* `connection_type` - The PrivateLink connection type.
+* `owner_id` - Owner ID of the connection.
+* `association_date` - Date the connection was associated.
+
+The `databases`  object is a list, with these attributes:
+* `database_id` - ID of the database.
+* `port` - The port which the database is available on.
+* `resource_link_endpoint` - The resource link endpoint for the database.

docs/data-sources/rediscloud_private_link.md

@@ -11,65 +11,12 @@ The PrivateLink data source allows the user to retrieve information about an exi
 ## Example Usage
 
 ```hcl
-
-locals {
-  rediscloud_subscription_name = "..."
-  rediscloud_cloud_account = "..."
-  rediscloud_private_link_share_name = "..."
-}
-
-data "rediscloud_payment_method" "card" {
-  card_type         = "Visa"
-}
-
-data "rediscloud_cloud_account" "account" {
-  exclude_internal_account = true
-  provider_type = "AWS"
-  name = local.rediscloud_cloud_account
-}
-
-resource "rediscloud_subscription" "subscription" {
-  name              = local.rediscloud_subscription_name
-  payment_method_id = data.rediscloud_payment_method.card.id
-
-  cloud_provider {
-    provider = data.rediscloud_cloud_account.account.provider_type
-    cloud_account_id = data.rediscloud_cloud_account.account.id
-    region {
-      region = "eu-west-1"
-      networking_deployment_cidr = "10.0.0.0/24"
-      preferred_availability_zones = ["eu-west-1a"]
-    }
-  }
-
-  creation_plan {
-    dataset_size_in_gb           = 15
-    quantity                     = 1
-    replication                  = true
-    throughput_measurement_by    = "operations-per-second"
-    throughput_measurement_value = 20000
-  }
+data "rediscloud_private_link" "example" {
+  subscription_id = "1234"
 }
 
-resource "rediscloud_private_link" "private_link" {
-  subscription_id = rediscloud_subscription.subscription.id
-  share_name = local.rediscloud_private_link_share_name
-
-  principal {
-    principal = "123456789012"
-    principal_type = "aws_account"
-    principal_alias = "principal 1"
-  }
-
-  principal {
-    principal = "123456789013"
-    principal_type = "aws_account"
-    principal_alias = "principal 2"
-  }
-}
-
-data "rediscloud_private_link" "private_link" {
-  subscription_id = rediscloud_private_link.private_link.subscription_id
+output "rediscloud_private_link_principals" {
+  value = data.rediscloud_private_link.example.principals
 }
 ```
 
@@ -80,11 +27,12 @@ data "rediscloud_private_link" "private_link" {
 ## Attribute reference
 
 * `principals` - The principal(s) attached to the PrivateLink.
-* `resource_configuration_id`
-* `resource_configuration_arn`
-* `share_arn`
-* `connections`
-* `databases`
+* `resource_configuration_id` - ID of the resource configuration to attach to this PrivateLink
+* `resource_configuration_arn` - ARN of the resource configuration to attach to this PrivateLink
+* `share_arn` - Share ARN of this PrivateLink.
+* `connections` - List of connections associated with the PrivateLink.
+* `databases` - List of databases associated with the PrivateLink.
+
 
 The `principals` object is a list, with these attributes:
 * `principal` - The principal attached to this PrivateLink.

docs/resources/rediscloud_active_active_private_link.md

@@ -5,30 +5,104 @@ description: |-
   PrivateLink resource for Active Active Subscription in the Redis Cloud Terraform provider.
 ---
 
-# Resource: rediscloud_active_activeprivate_link
+# Resource: rediscloud_active_active_private_link
 
 Manages a PrivateLink to a Active Active Subscription in your Redis Enterprise Cloud Account.
 
 ## Example Usage
 
+```hcl
+
+locals {
+  rediscloud_subscription_name = "..."
+  rediscloud_cloud_account = "..."
+  rediscloud_private_link_share_name = "..."
+  rediscloud_database_password = "..."
+}
+
+data "rediscloud_payment_method" "card" {
+  card_type         = "Visa"
+}
+
+data "rediscloud_cloud_account" "account" {
+  exclude_internal_account = true
+  provider_type = "AWS"
+  name = local.rediscloud_cloud_account
+}
+
+resource "rediscloud_active_active_subscription" "subscription" {
+  name              = local.rediscloud_subscription_name
+  payment_method_id = data.rediscloud_payment_method.card.id
+
+  cloud_provider {
+    provider = data.rediscloud_cloud_account.account.provider_type
+    cloud_account_id = data.rediscloud_cloud_account.account.id
+    region {
+      region = "eu-west-1"
+      networking_deployment_cidr = "10.0.0.0/24"
+      preferred_availability_zones = ["eu-west-1a"]
+    }
+  }
+
+  creation_plan {
+    dataset_size_in_gb           = 15
+    quantity                     = 1
+    replication                  = true
+    throughput_measurement_by    = "operations-per-second"
+    throughput_measurement_value = 20000
+  }
+}
+
+resource "rediscloud_active_active_subscription_database" "database_resource" {
+  subscription_id         = rediscloud_active_active_subscription.subscription.id
+  name                    = "db"
+  memory_limit_in_gb      = 1
+  global_data_persistence = "aof-every-1-second"
+  global_password         = local.rediscloud_database_password
+}
+
+
+resource "rediscloud_private_link" "private_link" {
+  subscription_id = rediscloud_subscription.subscription.id
+  share_name = local.rediscloud_private_link_share_name
+
+  principal {
+    principal = "123456789012"
+    principal_type = "aws_account"
+    principal_alias = "principal 1"
+  }
+
+  principal {
+    principal = "234567890123"
+    principal_type = "aws_account"
+    principal_alias = "principal 2"
+  }
+}
+```
+
 ## Argument Reference
 
-* `subscription_id` - (Required) The ID of the Pro Subscription to  **Modifying this attribute will force creation of a new resource.**
-* `share_name` - (Required)
-* `principal` - (Required) (block)
+* `subscription_id` - (Required) The ID of the Active Active Subscription to link to.  **Modifying this attribute will force creation of a new resource.**
 * `region_id` - (Required)
+* `share_name` - (Required) The share name of the PrivateLink.
+* `principal` - (Required) The principal(s) attached to the PrivateLink.
+
+The `principal` block supports:
+* `principal` - (Required) The principal to be added to this PrivateLink. The format depends upon the type of principal you wish to attach.
+* `principal_type` - (Required) The principal type. Can be one of: `aws_account`, `organization`, `organization_unit`, `iam_role`, `iam_user`, `service_principal`.
+* `principal_alias` - The friendly name to refer to the principal.
 
 ## Attribute Reference
 
-* `resource_configuration_id`
+* `resource_configuration_id` - Configuration I
 * `resource_configuration_arn`
 * `share_arn`
 * `connections` (block)
 * `databases` (block)
 
 ## Import
-`rediscloud_private_link` can be imported using the ID of the subscription and the name of the PrivateLink share, e.g.
+`rediscloud_active_active_private_link` can be imported using the ID of the subscription and the region id, e.g.
 
 ```
-$ terraform import rediscloud_active_active_private_link.id 1000/123456
+$ terraform import rediscloud_active_active_private_link.id 123456/1
 ```

docs/resources/rediscloud_active_active_subscription.md

@@ -57,7 +57,7 @@ resource "rediscloud_active_active_subscription" "subscription-resource" {
 The following arguments are supported:
 
 * `name` - (Required) A meaningful name to identify the subscription
-* `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` - (Optional) The payment method for the requested subscription, (either `credit-card` or `marketplace`).  Must not be set for direct contracts. 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. **Deprecated: This attribute is deprecated on the subscription level. Please specify `redis_version` on databases directly instead.**

docs/resources/rediscloud_private_link.md

@@ -72,7 +72,7 @@ resource "rediscloud_private_link" "private_link" {
 
 ## Argument Reference
 
-* `subscription_id` - (Required) The ID of the Pro Subscription to attach the PrivateLink to.  **Modifying this attribute will force creation of a new resource.**
+* `subscription_id` - (Required) The ID of the Pro Subscription to attach the PrivateLink to. **Modifying this attribute will force creation of a new resource.**
 * `share_name` - (Required) The share name of the PrivateLink.
 * `principal` - (Required) The principal(s) attached to the PrivateLink.
 
@@ -84,11 +84,11 @@ The `principal` block supports:
 
 ## Attribute Reference
 
-* `resource_configuration_id`
-* `resource_configuration_arn`
-* `share_arn`
-* `connections`
-* `databases`
+* `resource_configuration_id` - ID of the resource configuration to attach to this PrivateLink
+* `resource_configuration_arn` - ARN of the resource configuration to attach to this PrivateLink
+* `share_arn` - Share ARN of this PrivateLink.
+* `connections` - List of connections associated with the PrivateLink.
+* `databases` - List of databases associated with the PrivateLink.
 
 The `connections` object has these attributes:
 

go.mod

@@ -1,11 +1,11 @@
 module github.com/RedisLabs/terraform-provider-rediscloud
 
-go 1.23.0
+go 1.24.0
 
 toolchain go1.24.1
 
 require (
-	github.com/RedisLabs/rediscloud-go-api v0.36.2
+	github.com/RedisLabs/rediscloud-go-api v0.36.3
 	github.com/bflad/tfproviderlint v0.31.0
 	github.com/hashicorp/go-cty v1.5.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
@@ -55,13 +55,14 @@ require (
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/zclconf/go-cty v1.16.2 // indirect
-	golang.org/x/crypto v0.41.0 // indirect
-	golang.org/x/mod v0.27.0 // indirect
-	golang.org/x/net v0.43.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
-	golang.org/x/text v0.28.0 // indirect
-	golang.org/x/tools v0.36.0 // indirect
+	golang.org/x/crypto v0.42.0 // indirect
+	golang.org/x/mod v0.28.0 // indirect
+	golang.org/x/net v0.44.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/sys v0.36.0 // indirect
+	golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
+	golang.org/x/text v0.29.0 // indirect
+	golang.org/x/tools v0.37.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
 	google.golang.org/grpc v1.72.1 // indirect