Merge pull request #25230 from uchanchlani/issue-25229

Fix aws_keyspaces_table collection data types
hashicorp · Jun 22, 2022 · 64daad7 · 64daad7
2 parents 0556ad2 + 738667d
commit 64daad7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/.changelog/25230.txt b/.changelog/25230.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_keyspaces_table: Relax validation of the `schema_definition.column.type` argument to allow collection types
+```
diff --git a/internal/service/keyspaces/table.go b/internal/service/keyspaces/table.go
@@ -210,8 +210,8 @@ func ResourceTable() *schema.Resource {
 										Type:     schema.TypeString,
 										Required: true,
 										ValidateFunc: validation.StringMatch(
-											regexp.MustCompile(`^[a-z0-9]+$`),
-											"The type must consist of lower case alphanumerics.",
+											regexp.MustCompile(`^[a-z0-9]+(\<[a-z0-9]+(, *[a-z0-9]+){0,1}\>)?$`),
+											"The type must consist of lower case alphanumerics and an optional list of upto two lower case alphanumerics enclosed in angle brackets '<>'.",
 										),
 									},
 								},

diff --git a/internal/service/keyspaces/table_test.go b/internal/service/keyspaces/table_test.go
@@ -166,7 +166,7 @@ func TestAccKeyspacesTable_multipleColumns(t *testing.T) {
 						"name":     "region",
 						"order_by": "DESC",
 					}),
-					resource.TestCheckResourceAttr(resourceName, "schema_definition.0.column.#", "9"),
+					resource.TestCheckResourceAttr(resourceName, "schema_definition.0.column.#", "11"),
 					resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.column.*", map[string]string{
 						"name": "id",
 						"type": "text",
@@ -203,6 +203,14 @@ func TestAccKeyspacesTable_multipleColumns(t *testing.T) {
 						"name": "manager_id",
 						"type": "text",
 					}),
+					resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.column.*", map[string]string{
+						"name": "nicknames",
+						"type": "list<text>",
+					}),
+					resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.column.*", map[string]string{
+						"name": "tags",
+						"type": "map<text, text>",
+					}),
 					resource.TestCheckResourceAttr(resourceName, "schema_definition.0.partition_key.#", "1"),
 					resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.partition_key.*", map[string]string{
 						"name": "id",
@@ -648,6 +656,16 @@ resource "aws_keyspaces_table" "test" {
       type = "text"
     }
 
+    column {
+      name = "nicknames"
+      type = "list<text>"
+    }
+
+    column {
+      name = "tags"
+      type = "map<text, text>"
+    }
+
     partition_key {
       name = "id"
     }