From 99ece2b64b7fbd748b11f7ae53905d72cad57674 Mon Sep 17 00:00:00 2001 From: Ben Samsom Date: Thu, 11 May 2023 15:35:03 -0500 Subject: [PATCH 01/13] Bug #31348 - update regex for single character columns --- internal/service/keyspaces/table.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/keyspaces/table.go b/internal/service/keyspaces/table.go index ccdd5c30bd2a..c38be6655c78 100644 --- a/internal/service/keyspaces/table.go +++ b/internal/service/keyspaces/table.go @@ -204,7 +204,7 @@ func ResourceTable() *schema.Resource { ValidateFunc: validation.All( validation.StringLenBetween(1, 48), validation.StringMatch( - regexp.MustCompile(`^[a-z0-9][a-z0-9_]{1,47}$`), + regexp.MustCompile(`^[a-z0-9][a-z0-9_]{0,47}$`), "The name must consist of lower case alphanumerics and underscores.", ), ), From edead2f7343adb23deaa32faa57a012573e9af64 Mon Sep 17 00:00:00 2001 From: Ben Samsom Date: Thu, 11 May 2023 16:09:43 -0500 Subject: [PATCH 02/13] Update internal/service/keyspaces/table.go Co-authored-by: Matthew Burgess <549318+mattburgess@users.noreply.github.com> --- internal/service/keyspaces/table.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/keyspaces/table.go b/internal/service/keyspaces/table.go index c38be6655c78..3f4f50cfac4c 100644 --- a/internal/service/keyspaces/table.go +++ b/internal/service/keyspaces/table.go @@ -204,7 +204,7 @@ func ResourceTable() *schema.Resource { ValidateFunc: validation.All( validation.StringLenBetween(1, 48), validation.StringMatch( - regexp.MustCompile(`^[a-z0-9][a-z0-9_]{0,47}$`), + regexp.MustCompile(`[a-zA-Z0-9][a-zA-Z0-9_]{0,47}$`), "The name must consist of lower case alphanumerics and underscores.", ), ), From 83ab93da42c904dc33fba32b8bf867f0d2d9cd7d Mon Sep 17 00:00:00 2001 From: Ben Samsom Date: Fri, 12 May 2023 09:51:47 -0500 Subject: [PATCH 03/13] Update table.go --- internal/service/keyspaces/table.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/keyspaces/table.go b/internal/service/keyspaces/table.go index 3f4f50cfac4c..8764253ab51f 100644 --- a/internal/service/keyspaces/table.go +++ b/internal/service/keyspaces/table.go @@ -204,7 +204,7 @@ func ResourceTable() *schema.Resource { ValidateFunc: validation.All( validation.StringLenBetween(1, 48), validation.StringMatch( - regexp.MustCompile(`[a-zA-Z0-9][a-zA-Z0-9_]{0,47}$`), + regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_]*$`), "The name must consist of lower case alphanumerics and underscores.", ), ), From a312890c379f513473f14718128705f390e747df Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 9 Jun 2023 15:19:04 -0400 Subject: [PATCH 04/13] Revert "Update table.go" This reverts commit 83ab93da42c904dc33fba32b8bf867f0d2d9cd7d. --- internal/service/keyspaces/table.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/keyspaces/table.go b/internal/service/keyspaces/table.go index 8764253ab51f..3f4f50cfac4c 100644 --- a/internal/service/keyspaces/table.go +++ b/internal/service/keyspaces/table.go @@ -204,7 +204,7 @@ func ResourceTable() *schema.Resource { ValidateFunc: validation.All( validation.StringLenBetween(1, 48), validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_]*$`), + regexp.MustCompile(`[a-zA-Z0-9][a-zA-Z0-9_]{0,47}$`), "The name must consist of lower case alphanumerics and underscores.", ), ), From 7864054784bf5307d212459f294bc86b65bb5a4c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 9 Jun 2023 15:19:22 -0400 Subject: [PATCH 05/13] Revert "Update internal/service/keyspaces/table.go" This reverts commit edead2f7343adb23deaa32faa57a012573e9af64. --- internal/service/keyspaces/table.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/keyspaces/table.go b/internal/service/keyspaces/table.go index 3f4f50cfac4c..c38be6655c78 100644 --- a/internal/service/keyspaces/table.go +++ b/internal/service/keyspaces/table.go @@ -204,7 +204,7 @@ func ResourceTable() *schema.Resource { ValidateFunc: validation.All( validation.StringLenBetween(1, 48), validation.StringMatch( - regexp.MustCompile(`[a-zA-Z0-9][a-zA-Z0-9_]{0,47}$`), + regexp.MustCompile(`^[a-z0-9][a-z0-9_]{0,47}$`), "The name must consist of lower case alphanumerics and underscores.", ), ), From f8d1790678003784e153f25a5ce903e5cb5e7fe7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 9 Jun 2023 15:19:33 -0400 Subject: [PATCH 06/13] Revert "Bug #31348 - update regex for single character columns" This reverts commit 99ece2b64b7fbd748b11f7ae53905d72cad57674. --- internal/service/keyspaces/table.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/keyspaces/table.go b/internal/service/keyspaces/table.go index c38be6655c78..ccdd5c30bd2a 100644 --- a/internal/service/keyspaces/table.go +++ b/internal/service/keyspaces/table.go @@ -204,7 +204,7 @@ func ResourceTable() *schema.Resource { ValidateFunc: validation.All( validation.StringLenBetween(1, 48), validation.StringMatch( - regexp.MustCompile(`^[a-z0-9][a-z0-9_]{0,47}$`), + regexp.MustCompile(`^[a-z0-9][a-z0-9_]{1,47}$`), "The name must consist of lower case alphanumerics and underscores.", ), ), From 9bcca450f37edac048427606d987242c7d7096ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 9 Jun 2023 15:22:06 -0400 Subject: [PATCH 07/13] r/aws_keyspaces_keyspace: Correct 'name' validation. --- internal/service/keyspaces/keyspace.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/service/keyspaces/keyspace.go b/internal/service/keyspaces/keyspace.go index 29451230630b..43d5be382d19 100644 --- a/internal/service/keyspaces/keyspace.go +++ b/internal/service/keyspaces/keyspace.go @@ -48,12 +48,9 @@ func ResourceKeyspace() *schema.Resource { Type: schema.TypeString, ForceNew: true, Required: true, - ValidateFunc: validation.All( - validation.StringLenBetween(1, 48), - validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_]{1,47}$`), - "The name must consist of alphanumerics and underscores.", - ), + ValidateFunc: validation.StringMatch( + regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_]{0,47}$`), + "The name can have up to 48 characters. It must begin with an alpha-numeric character and can only contain alpha-numeric characters and underscores.", ), }, names.AttrTags: tftags.TagsSchema(), From bb4c88c3ce153218687edf72f9bad1b8711e27e2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 9 Jun 2023 15:25:08 -0400 Subject: [PATCH 08/13] Add CHANGELOG entry. --- .changelog/31352.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/31352.txt diff --git a/.changelog/31352.txt b/.changelog/31352.txt new file mode 100644 index 000000000000..21ef9d71a5b4 --- /dev/null +++ b/.changelog/31352.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_keyspaces_keyspace: Correct plan time validation for `name` +``` \ No newline at end of file From 9ef476b6f847cd989685289a0dbc2cca8f6d7ad6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 9 Jun 2023 15:39:57 -0400 Subject: [PATCH 09/13] r/aws_keyspaces_table: Correct 'keyspace_name', 'table_name' and column name validations. --- .changelog/31352.txt | 4 +++ internal/service/keyspaces/table.go | 54 ++++++++++------------------- 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/.changelog/31352.txt b/.changelog/31352.txt index 21ef9d71a5b4..fea17218a3cf 100644 --- a/.changelog/31352.txt +++ b/.changelog/31352.txt @@ -1,3 +1,7 @@ ```release-note:bug resource/aws_keyspaces_keyspace: Correct plan time validation for `name` +``` + +```release-note:bug +resource/aws_keyspaces_table: Correct plan time validation for `keyspace_name`, `table_name` and column names ``` \ No newline at end of file diff --git a/internal/service/keyspaces/table.go b/internal/service/keyspaces/table.go index ccdd5c30bd2a..78f70441e40d 100644 --- a/internal/service/keyspaces/table.go +++ b/internal/service/keyspaces/table.go @@ -136,12 +136,9 @@ func ResourceTable() *schema.Resource { Type: schema.TypeString, ForceNew: true, Required: true, - ValidateFunc: validation.All( - validation.StringLenBetween(1, 48), - validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_]{1,47}$`), - "The name must consist of alphanumerics and underscores.", - ), + ValidateFunc: validation.StringMatch( + regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_]{0,47}$`), + "The keyspace name can have up to 48 characters. It must begin with an alpha-numeric character and can only contain alpha-numeric characters and underscores.", ), }, "point_in_time_recovery": { @@ -176,12 +173,9 @@ func ResourceTable() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validation.All( - validation.StringLenBetween(1, 48), - validation.StringMatch( - regexp.MustCompile(`^[a-z0-9][a-z0-9_]{1,47}$`), - "The name must consist of lower case alphanumerics and underscores.", - ), + ValidateFunc: validation.StringMatch( + regexp.MustCompile(`^[a-zA-Z0-9_]{1, 48}$`), + "The column name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", ), }, "order_by": { @@ -201,12 +195,9 @@ func ResourceTable() *schema.Resource { "name": { Type: schema.TypeString, Required: true, - ValidateFunc: validation.All( - validation.StringLenBetween(1, 48), - validation.StringMatch( - regexp.MustCompile(`^[a-z0-9][a-z0-9_]{1,47}$`), - "The name must consist of lower case alphanumerics and underscores.", - ), + ValidateFunc: validation.StringMatch( + regexp.MustCompile(`^[a-zA-Z0-9_]{1, 48}$`), + "The column name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", ), }, "type": { @@ -230,12 +221,9 @@ func ResourceTable() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validation.All( - validation.StringLenBetween(1, 48), - validation.StringMatch( - regexp.MustCompile(`^[a-z0-9][a-z0-9_]{1,47}$`), - "The name must consist of lower case alphanumerics and underscores.", - ), + ValidateFunc: validation.StringMatch( + regexp.MustCompile(`^[a-zA-Z0-9_]{1, 48}$`), + "The column name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", ), }, }, @@ -251,12 +239,9 @@ func ResourceTable() *schema.Resource { Type: schema.TypeString, Required: true, ForceNew: true, - ValidateFunc: validation.All( - validation.StringLenBetween(1, 48), - validation.StringMatch( - regexp.MustCompile(`^[a-z0-9][a-z0-9_]{1,47}$`), - "The name must consist of lower case alphanumerics and underscores.", - ), + ValidateFunc: validation.StringMatch( + regexp.MustCompile(`^[a-zA-Z0-9_]{1, 48}$`), + "The column name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", ), }, }, @@ -269,12 +254,9 @@ func ResourceTable() *schema.Resource { Type: schema.TypeString, ForceNew: true, Required: true, - ValidateFunc: validation.All( - validation.StringLenBetween(1, 48), - validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_]{1,47}$`), - "The name must consist of alphanumerics and underscores.", - ), + ValidateFunc: validation.StringMatch( + regexp.MustCompile(`^[a-zA-Z0-9_]{1, 48}$`), + "The table name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", ), }, names.AttrTags: tftags.TagsSchema(), From e9e4511567f4995be904ba16fa73389390a61315 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 9 Jun 2023 15:43:33 -0400 Subject: [PATCH 10/13] Modify 'TestAccKeyspacesTable_multipleColumns'. --- internal/service/keyspaces/table_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/keyspaces/table_test.go b/internal/service/keyspaces/table_test.go index 06acbc2ba94a..0370893fa678 100644 --- a/internal/service/keyspaces/table_test.go +++ b/internal/service/keyspaces/table_test.go @@ -172,11 +172,11 @@ func TestAccKeyspacesTable_multipleColumns(t *testing.T) { }), resource.TestCheckResourceAttr(resourceName, "schema_definition.0.column.#", "11"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.column.*", map[string]string{ - "name": "id", + "name": "ID", "type": "text", }), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.column.*", map[string]string{ - "name": "name", + "name": "n", "type": "text", }), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.column.*", map[string]string{ @@ -196,7 +196,7 @@ func TestAccKeyspacesTable_multipleColumns(t *testing.T) { "type": "text", }), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.column.*", map[string]string{ - "name": "pay_scale", + "name": "Pay_Scale0", "type": "int", }), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.column.*", map[string]string{ @@ -621,12 +621,12 @@ resource "aws_keyspaces_table" "test" { schema_definition { column { - name = "id" + name = "ID" type = "text" } column { - name = "name" + name = "n" type = "text" } @@ -651,7 +651,7 @@ resource "aws_keyspaces_table" "test" { } column { - name = "pay_scale" + name = "Pay_Scale0" type = "int" } From e2eb9291a94f09a76682d7388858c4f0677505ac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 9 Jun 2023 15:48:44 -0400 Subject: [PATCH 11/13] Fix typo. --- internal/service/keyspaces/table.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/keyspaces/table.go b/internal/service/keyspaces/table.go index 78f70441e40d..0cc5a84c0924 100644 --- a/internal/service/keyspaces/table.go +++ b/internal/service/keyspaces/table.go @@ -174,7 +174,7 @@ func ResourceTable() *schema.Resource { Required: true, ForceNew: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9_]{1, 48}$`), + regexp.MustCompile(`^[a-zA-Z0-9_]{1,48}$`), "The column name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", ), }, @@ -196,7 +196,7 @@ func ResourceTable() *schema.Resource { Type: schema.TypeString, Required: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9_]{1, 48}$`), + regexp.MustCompile(`^[a-zA-Z0-9_]{1,48}$`), "The column name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", ), }, @@ -222,7 +222,7 @@ func ResourceTable() *schema.Resource { Required: true, ForceNew: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9_]{1, 48}$`), + regexp.MustCompile(`^[a-zA-Z0-9_]{1,48}$`), "The column name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", ), }, @@ -240,7 +240,7 @@ func ResourceTable() *schema.Resource { Required: true, ForceNew: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9_]{1, 48}$`), + regexp.MustCompile(`^[a-zA-Z0-9_]{1,48}$`), "The column name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", ), }, @@ -255,7 +255,7 @@ func ResourceTable() *schema.Resource { ForceNew: true, Required: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9_]{1, 48}$`), + regexp.MustCompile(`^[a-zA-Z0-9_]{1,48}$`), "The table name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", ), }, From 2b9fe29ade73213678921a3875ac9ebd4d0903be Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 9 Jun 2023 16:06:02 -0400 Subject: [PATCH 12/13] Correct 'TestAccKeyspacesTable_multipleColumns'. --- internal/service/keyspaces/table_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/keyspaces/table_test.go b/internal/service/keyspaces/table_test.go index 0370893fa678..e1940fc0271e 100644 --- a/internal/service/keyspaces/table_test.go +++ b/internal/service/keyspaces/table_test.go @@ -217,14 +217,14 @@ func TestAccKeyspacesTable_multipleColumns(t *testing.T) { }), resource.TestCheckResourceAttr(resourceName, "schema_definition.0.partition_key.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.partition_key.*", map[string]string{ - "name": "id", + "name": "ID", }), resource.TestCheckResourceAttr(resourceName, "schema_definition.0.static_column.#", "2"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.static_column.*", map[string]string{ "name": "role", }), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.static_column.*", map[string]string{ - "name": "pay_scale", + "name": "Pay_Scale0", }), ), }, @@ -676,7 +676,7 @@ resource "aws_keyspaces_table" "test" { } partition_key { - name = "id" + name = "ID" } clustering_key { @@ -694,7 +694,7 @@ resource "aws_keyspaces_table" "test" { } static_column { - name = "pay_scale" + name = "Pay_Scale0" } } } From 18486bf0c7043946f46d2f52602673a30ef4f772 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 9 Jun 2023 16:11:23 -0400 Subject: [PATCH 13/13] r/aws_keyspaces_table: Column names can only contain lowercase alpha-numeric characters and underscores. --- internal/service/keyspaces/table.go | 16 ++++++++-------- internal/service/keyspaces/table_test.go | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/service/keyspaces/table.go b/internal/service/keyspaces/table.go index 0cc5a84c0924..9585cc916beb 100644 --- a/internal/service/keyspaces/table.go +++ b/internal/service/keyspaces/table.go @@ -174,8 +174,8 @@ func ResourceTable() *schema.Resource { Required: true, ForceNew: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9_]{1,48}$`), - "The column name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", + regexp.MustCompile(`^[a-z0-9_]{1,48}$`), + "The column name can have up to 48 characters. It can only contain lowercase alpha-numeric characters and underscores.", ), }, "order_by": { @@ -196,8 +196,8 @@ func ResourceTable() *schema.Resource { Type: schema.TypeString, Required: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9_]{1,48}$`), - "The column name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", + regexp.MustCompile(`^[a-z0-9_]{1,48}$`), + "The column name can have up to 48 characters. It can only contain lowercase alpha-numeric characters and underscores.", ), }, "type": { @@ -222,8 +222,8 @@ func ResourceTable() *schema.Resource { Required: true, ForceNew: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9_]{1,48}$`), - "The column name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", + regexp.MustCompile(`^[a-z0-9_]{1,48}$`), + "The column name can have up to 48 characters. It can only contain lowercase alpha-numeric characters and underscores.", ), }, }, @@ -240,8 +240,8 @@ func ResourceTable() *schema.Resource { Required: true, ForceNew: true, ValidateFunc: validation.StringMatch( - regexp.MustCompile(`^[a-zA-Z0-9_]{1,48}$`), - "The column name can have up to 48 characters. It can only contain alpha-numeric characters and underscores.", + regexp.MustCompile(`^[a-z0-9_]{1,48}$`), + "The column name can have up to 48 characters. It can only contain lowercase alpha-numeric characters and underscores.", ), }, }, diff --git a/internal/service/keyspaces/table_test.go b/internal/service/keyspaces/table_test.go index e1940fc0271e..98605bcb3af5 100644 --- a/internal/service/keyspaces/table_test.go +++ b/internal/service/keyspaces/table_test.go @@ -172,7 +172,7 @@ func TestAccKeyspacesTable_multipleColumns(t *testing.T) { }), resource.TestCheckResourceAttr(resourceName, "schema_definition.0.column.#", "11"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.column.*", map[string]string{ - "name": "ID", + "name": "id", "type": "text", }), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.column.*", map[string]string{ @@ -196,7 +196,7 @@ func TestAccKeyspacesTable_multipleColumns(t *testing.T) { "type": "text", }), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.column.*", map[string]string{ - "name": "Pay_Scale0", + "name": "pay_scale0", "type": "int", }), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.column.*", map[string]string{ @@ -217,14 +217,14 @@ func TestAccKeyspacesTable_multipleColumns(t *testing.T) { }), resource.TestCheckResourceAttr(resourceName, "schema_definition.0.partition_key.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.partition_key.*", map[string]string{ - "name": "ID", + "name": "id", }), resource.TestCheckResourceAttr(resourceName, "schema_definition.0.static_column.#", "2"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.static_column.*", map[string]string{ "name": "role", }), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "schema_definition.0.static_column.*", map[string]string{ - "name": "Pay_Scale0", + "name": "pay_scale0", }), ), }, @@ -621,7 +621,7 @@ resource "aws_keyspaces_table" "test" { schema_definition { column { - name = "ID" + name = "id" type = "text" } @@ -651,7 +651,7 @@ resource "aws_keyspaces_table" "test" { } column { - name = "Pay_Scale0" + name = "pay_scale0" type = "int" } @@ -676,7 +676,7 @@ resource "aws_keyspaces_table" "test" { } partition_key { - name = "ID" + name = "id" } clustering_key { @@ -694,7 +694,7 @@ resource "aws_keyspaces_table" "test" { } static_column { - name = "Pay_Scale0" + name = "pay_scale0" } } }