Merge pull request #630 from RedisLabs/develop

2.1.5 release

Author: burythehammer

.github/workflows/terraform_provider_pr.yml

@@ -126,6 +126,18 @@ jobs:
       - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloudEssentialsDatabase_CRUDI"'
 
 
+  go_test_smoke_essentials_sub:
+    name: go test smoke essentials sub
+    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="TestAccResourceRedisCloudEssentialsSubscription"'
+
+
   go_test_smoke_pro_db:
     name: go test smoke pro db
     needs: [go_build]

CHANGELOG.md

@@ -4,6 +4,25 @@ 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.1.5 (1st July 2025)
+
+### Added
+
+Feature: Support Marketplace as a payment method for Essentials subscription
+Feature: Add TLS certificate to databases’ data sources
+
+### Fixed:
+
+Unexpected state `dynamic-endpoints-creation-pending'
+Can not disable default user on essentials db
+
+# 2.1.4 (22nd May 2025)
+
+### Added
+
+- Documentation for `rediscloud_active_active_subscription_regions` added.
+- Schema documentation amended to match documentation above.
+
 # 2.1.3 (21st May 2025)
 
 ### Added

docs/data-sources/rediscloud_active_active_subscription_database.md

@@ -47,6 +47,7 @@ data "rediscloud_active_active_subscription_database" "example" {
 * `support_oss_cluster_api` - Supports the Redis open-source (OSS) Cluster API.
 * `external_endpoint_for_oss_cluster_api` - Use the external endpoint for open-source (OSS) Cluster API.
 * `enable_tls` - Enable TLS for database.
+* `tls_certificate` - TLS certificate used for authentication.
 * `data_eviction` - The data items eviction policy.
 * `global_modules` - A list of modules to be enabled on all deployments of this database.
 * `public_endpoint` - Public endpoint to access the database.

docs/data-sources/rediscloud_essentials_subscription.md

@@ -33,5 +33,6 @@ output "rediscloud_essentials_subscription" {
 
 * `status` - The current status of the subscription
 * `plan_id` - The plan to which this subscription belongs
+* `payment_method` - Payment method for the requested subscription. If `credit-card` is specified, the payment method id must be defined. This information is only used when creating a new subscription and any changes will be ignored after this.
 * `payment_method_id` - A valid payment method pre-defined in the current account
 * `creation_date` - When the subscription was created

docs/resources/rediscloud_essentials_database.md

@@ -67,7 +67,7 @@ The following arguments are supported:
 * `replica` - (Optional) If specified, this database will be a replica of the specified Redis databases provided, documented below.
 * `client_tls_certificates` - (Optional) A list of TLS/SSL certificates (public keys) with new line characters replaced by \n.
 * `password` - (Optional) Password to access the database. If not specified, a random 32 character long alphanumeric password will be automatically generated.
-* `enable_default_user` - (Optional) When `true` enables connecting to the database with the default user. Default `true`.
+* `enable_default_user` - (Optional) When `true` enables connecting to the database with the default user. Default `true`. If set to `false`, any value for `password` will be ignored.
 * `alert` - (Optional) A block defining Redis database alert. Can be specified multiple times. Documented below.
 * `tags` - (Optional) A string/string map of tags to associate with this database. Note that all keys and values must be lowercase.
 * `modules` - (Optional) A list of modules objects, documented below. **Modifying this attribute will force creation of a new resource.**

go.mod

@@ -3,7 +3,7 @@ module github.com/RedisLabs/terraform-provider-rediscloud
 go 1.22.4
 
 require (
-	github.com/RedisLabs/rediscloud-go-api v0.26.0
+	github.com/RedisLabs/rediscloud-go-api v0.29.0
 	github.com/bflad/tfproviderlint v0.31.0
 	github.com/hashicorp/go-cty v1.5.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
@@ -66,3 +66,6 @@ require (
 	google.golang.org/protobuf v1.36.3 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+// for local development, uncomment this
+//replace github.com/RedisLabs/rediscloud-go-api => ../rediscloud-go-api

go.sum

@@ -4,8 +4,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
 github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
-github.com/RedisLabs/rediscloud-go-api v0.26.0 h1:ka6CN2O+Ti6igkfH8lDT9Ua1/ksEh2H5dj1GF/pnKKQ=
-github.com/RedisLabs/rediscloud-go-api v0.26.0/go.mod h1:3/oVb71rv2OstFRYEc65QCIbfwnJTgZeQhtPCcdHook=
+github.com/RedisLabs/rediscloud-go-api v0.29.0 h1:XLVBMSgHwaaHFmf+TXrsU2veQ67J+e5Xrz54FggnwTY=
+github.com/RedisLabs/rediscloud-go-api v0.29.0/go.mod h1:3/oVb71rv2OstFRYEc65QCIbfwnJTgZeQhtPCcdHook=
 github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
 github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=

provider/datasource_rediscloud_active_active_database.go

@@ -58,6 +58,11 @@ func dataSourceRedisCloudActiveActiveDatabase() *schema.Resource {
 				Type:        schema.TypeBool,
 				Computed:    true,
 			},
+			"tls_certificate": {
+				Description: "TLS certificate used for authentication.",
+				Type:        schema.TypeString,
+				Computed:    true,
+			},
 			"data_eviction": {
 				Description: "Data eviction items policy",
 				Type:        schema.TypeString,
@@ -362,9 +367,30 @@ func dataSourceRedisCloudActiveActiveDatabaseRead(ctx context.Context, d *schema
 		return diag.FromErr(err)
 	}
 
+	if dbTlsCertificate, err := getCertificateData(ctx, api, subId, dbId); err != nil {
+		return diag.FromErr(err)
+	} else if dbTlsCertificate != nil {
+		if err := d.Set("tls_certificate", dbTlsCertificate.PublicCertificatePEMString); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return diags
 }
 
+func getCertificateData(ctx context.Context, api *apiClient, subId int, dbId int) (*databases.DatabaseCertificate, error) {
+	dbTlsCertificate, err := api.client.Database.GetCertificate(ctx, subId, dbId)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if dbTlsCertificate == nil {
+		return nil, fmt.Errorf("no certificate found for database %d", dbId)
+	}
+	return dbTlsCertificate, nil
+}
+
 func filterAADatabases(list *databases.ListActiveActiveDatabase, filters []func(db *databases.ActiveActiveDatabase) bool) ([]*databases.ActiveActiveDatabase, error) {
 	var filtered []*databases.ActiveActiveDatabase
 	for list.Next() {

provider/datasource_rediscloud_essentials_subscription.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	"github.com/RedisLabs/rediscloud-go-api/redis"
-	fixedSubscriptions "github.com/RedisLabs/rediscloud-go-api/service/fixed/subscriptions"
+	fs "github.com/RedisLabs/rediscloud-go-api/service/fixed/subscriptions"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -60,16 +60,16 @@ func dataSourceRedisCloudEssentialsSubscriptionRead(ctx context.Context, d *sche
 		return diag.FromErr(err)
 	}
 
-	var filters []func(method *fixedSubscriptions.FixedSubscription) bool
+	var filters []func(method *fs.FixedSubscriptionResponse) bool
 
 	if id, ok := d.GetOk("id"); ok {
-		filters = append(filters, func(sub *fixedSubscriptions.FixedSubscription) bool {
+		filters = append(filters, func(sub *fs.FixedSubscriptionResponse) bool {
 			return redis.IntValue(sub.ID) == id
 		})
 	}
 
 	if name, ok := d.GetOk("name"); ok {
-		filters = append(filters, func(sub *fixedSubscriptions.FixedSubscription) bool {
+		filters = append(filters, func(sub *fs.FixedSubscriptionResponse) bool {
 			return redis.StringValue(sub.Name) == name
 		})
 	}
@@ -109,8 +109,8 @@ func dataSourceRedisCloudEssentialsSubscriptionRead(ctx context.Context, d *sche
 	return diags
 }
 
-func filterFixedSubscriptions(subs []*fixedSubscriptions.FixedSubscription, filters []func(sub *fixedSubscriptions.FixedSubscription) bool) []*fixedSubscriptions.FixedSubscription {
-	var filteredSubs []*fixedSubscriptions.FixedSubscription
+func filterFixedSubscriptions(subs []*fs.FixedSubscriptionResponse, filters []func(sub *fs.FixedSubscriptionResponse) bool) []*fs.FixedSubscriptionResponse {
+	var filteredSubs []*fs.FixedSubscriptionResponse
 	for _, sub := range subs {
 		if filterFixedSub(sub, filters) {
 			filteredSubs = append(filteredSubs, sub)
@@ -120,7 +120,7 @@ func filterFixedSubscriptions(subs []*fixedSubscriptions.FixedSubscription, filt
 	return filteredSubs
 }
 
-func filterFixedSub(method *fixedSubscriptions.FixedSubscription, filters []func(method *fixedSubscriptions.FixedSubscription) bool) bool {
+func filterFixedSub(method *fs.FixedSubscriptionResponse, filters []func(method *fs.FixedSubscriptionResponse) bool) bool {
 	for _, f := range filters {
 		if !f(method) {
 			return false

provider/rediscloud_active_active_database_test.go

@@ -112,6 +112,8 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "support_oss_cluster_api", "false"),
 					resource.TestCheckResourceAttr(datasourceName, "external_endpoint_for_oss_cluster_api", "false"),
 					resource.TestCheckResourceAttr(datasourceName, "enable_tls", "false"),
+					resource.TestCheckResourceAttrSet(datasourceName, "tls_certificate"),
+
 					resource.TestCheckResourceAttr(datasourceName, "data_eviction", "volatile-lru"),
 					resource.TestCheckResourceAttr(datasourceName, "global_modules.#", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "global_modules.0", "RedisJSON"),