updates for multi-region CDC (#449)

* fix bug on CDCv3 create
* update docs
* add and update tests

Author: pgier

docs/resources/cdc.md

@@ -3,12 +3,12 @@
 page_title: "astra_cdc Resource - terraform-provider-astra"
 subcategory: ""
 description: |-
-  astra_cdc enables cdc for an Astra Serverless table.
+  Deprecated as of version 2.4, please use astra_cdc_v3 resource instead.
 ---
 
 # astra_cdc (Resource)
 
-`astra_cdc` enables cdc for an Astra Serverless table.
+Deprecated as of version 2.4, please use `astra_cdc_v3` resource instead.
 
 ## Example Usage
 

internal/provider/resource_cdc.go

@@ -22,7 +22,7 @@ import (
 func resourceCDC() *schema.Resource {
 	return &schema.Resource{
 		DeprecationMessage: "`astra_cdc` is deprecated, please migrate to `astra_cdc_v3`.",
-		Description:        "`astra_cdc` enables cdc for an Astra Serverless table.",
+		Description:        "Deprecated as of version 2.4, please use `astra_cdc_v3` resource instead.",
 		CreateContext:      resourceCDCCreate,
 		ReadContext:        resourceCDCRead,
 		DeleteContext:      resourceCDCDelete,

internal/provider/resource_cdc_test.go

@@ -68,7 +68,8 @@ resource "astra_table" "table_1" {
   partition_keys     = "b"
   column_definitions = [
     {
-      Name: "a"-      Static: false
+      Name: "a"
+      Static: false
       TypeDefinition: "text"
     },
     {

internal/provider/resource_cdc_v3.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 
 	"github.com/datastax/astra-client-go/v2/astra"
+	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
@@ -47,9 +48,9 @@ type CDCResourceModel struct {
 }
 
 type KeyspaceTable struct {
-	Keyspace   types.String   `tfsdk:"keyspace"`
-	Table      types.String   `tfsdk:"table"`
-	DataTopics []types.String `tfsdk:"data_topics"`
+	Keyspace   types.String `tfsdk:"keyspace"`
+	Table      types.String `tfsdk:"table"`
+	DataTopics types.List   `tfsdk:"data_topics"`
 }
 
 type DatacenterToStreamingMap struct {
@@ -61,12 +62,15 @@ type DatacenterToStreamingMap struct {
 
 // setDataTopics updates the data topics field for each table based on caculateCDCDataTopicName.
 func (m *CDCResourceModel) setDataTopics() {
+
 	for i := range m.Tables {
-		m.Tables[i].DataTopics = make([]types.String, len(m.Regions))
-		for j := range m.Regions {
-			m.Tables[i].DataTopics[j] = types.StringValue(calculateCDCDataTopicName(m.Regions[j].StreamingTenant.ValueString(),
-				m.DatabaseID.ValueString(), m.Tables[i].Keyspace.ValueString(), m.Tables[i].Table.ValueString()))
+		dataTopics := []attr.Value{}
+
+		for _, region := range m.Regions {
+			topicFQDN := calculateCDCDataTopicName(region.StreamingTenant.ValueString(), m.DatabaseID.ValueString(), m.Tables[i].Keyspace.ValueString(), m.Tables[i].Table.ValueString())
+			dataTopics = append(dataTopics, types.StringValue(topicFQDN))
 		}
+		m.Tables[i].DataTopics, _ = types.ListValue(types.StringType, dataTopics)
 	}
 }
 

internal/provider/resource_cdc_v3_test.go

@@ -0,0 +1,109 @@
+package provider
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAstraCDCv3(t *testing.T) {
+	checkRequiredTestVars(t, "ASTRA_TEST_CDC_V3_TEST_ENABLED")
+	streamingTenant := "terraform-cdcv3-test-" + randomString(4)
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAstraCDCv3Config("GCP", "us-east1", streamingTenant),
+			},
+		},
+	})
+}
+
+func testAstraCDCv3Config(cloud_provider, region, streamingTenant string) string {
+	return fmt.Sprintf(`
+
+resource "astra_database" "database_1" {
+  cloud_provider      = "%s"
+  regions             = ["%s"]
+  name                = "terraform-cdc-test"
+  keyspace            = "ks1"
+  deletion_protection = "false"
+}
+
+resource "astra_table" "table_1" {
+  database_id        = astra_database.database_1.id
+  keyspace           = astra_database.database_1.keyspace
+  region             = astra_database.database_1.region[0]
+  table              = "cdctable1"
+  clustering_columns = "a"
+  partition_keys     = "b"
+  column_definitions = [
+    {
+      Name: "a"
+      Static: false
+      TypeDefinition: "text"
+    },
+    {
+      Name: "b"
+      Static: false
+      TypeDefinition: "text"
+    }
+  ]
+}
+
+resource "astra_table" "table_2" {
+  database_id        = astra_database.database_1.id
+  keyspace           = astra_database.database_1.keyspace
+  region             = astra_database.database_1.region[0]
+  table              = "cdctable2"
+  clustering_columns = "a"
+  partition_keys     = "b"
+  column_definitions = [
+    {
+      Name: "a"
+      Static: false
+      TypeDefinition: "text"
+    },
+    {
+      Name: "b"
+      Static: false
+      TypeDefinition: "text"
+    }
+  ]
+}
+
+resource "astra_streaming_tenant" "tenant_1" {
+  cluster_name        = "pulsar-gcp-useast1"
+  tenant_name         = "%s"
+  user_email          = "test@datastax.com"
+  deletion_protection = "false"
+}
+
+ resource "astra_cdc_v3" "cdc_1" {
+  depends_on         = [ astra_database.database_1, astra_streaming_tenant.streaming_tenant_1 ]
+  database_id        = astra_database.database_1.id
+  database_name      = astra_database.database_1.name
+  tables = [
+    {
+      keyspace = "ks1"
+      table    = "table1"
+    },
+    {
+      keyspace = "ks1"
+      table    = "table2"
+    },
+  ]
+  regions = [
+    {
+      region   = "us-east1"
+      datacenter_id     = "${astra_database.example.id}-1"
+      streaming_cluster = astra_streaming_tenant.tenant_1.cluster_name
+      streaming_tenant  = astra_streaming_tenant.tenant_1.tenant_name
+    },
+  ]
+
+}`, cloud_provider, region, streamingTenant)
+
+}