Merge pull request #26812 from michaelraney/main

Fix PartitionKey and ClusteringKey Types in Schema

.changelog/26812.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_keyspaces_table: Change `schema_definition.clustering_key` and `schema_definition.partition_key` to lists in order to respect configured orderings
+```

internal/service/keyspaces/table.go

@@ -164,7 +164,7 @@ func ResourceTable() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"clustering_key": {
-							Type:     schema.TypeSet,
+							Type:     schema.TypeList,
 							Optional: true,
 							ForceNew: true,
 							Elem: &schema.Resource{
@@ -218,7 +218,7 @@ func ResourceTable() *schema.Resource {
 							},
 						},
 						"partition_key": {
-							Type:     schema.TypeSet,
+							Type:     schema.TypeList,
 							Required: true,
 							ForceNew: true,
 							Elem: &schema.Resource{
@@ -802,16 +802,16 @@ func expandSchemaDefinition(tfMap map[string]interface{}) *keyspaces.SchemaDefin
 
 	apiObject := &keyspaces.SchemaDefinition{}
 
-	if v, ok := tfMap["column"].(*schema.Set); ok && v.Len() > 0 {
-		apiObject.AllColumns = expandColumnDefinitions(v.List())
+	if v, ok := tfMap["clustering_key"].([]interface{}); ok && len(v) > 0 {
+		apiObject.ClusteringKeys = expandClusteringKeys(v)
 	}
 
-	if v, ok := tfMap["clustering_key"].(*schema.Set); ok && v.Len() > 0 {
-		apiObject.ClusteringKeys = expandClusteringKeys(v.List())
+	if v, ok := tfMap["column"].(*schema.Set); ok && v.Len() > 0 {
+		apiObject.AllColumns = expandColumnDefinitions(v.List())
 	}
 
-	if v, ok := tfMap["partition_key"].(*schema.Set); ok && v.Len() > 0 {
-		apiObject.PartitionKeys = expandPartitionKeys(v.List())
+	if v, ok := tfMap["partition_key"].([]interface{}); ok && len(v) > 0 {
+		apiObject.PartitionKeys = expandPartitionKeys(v)
 	}
 
 	if v, ok := tfMap["static_column"].(*schema.Set); ok && v.Len() > 0 {