ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2455 from semarj/master 

dynamodb - only require nonkey attributes on INCLUDE
This commit is contained in:
Mitchell Hashimoto 2015-06-25 09:03:44 -07:00
parent 6edc3d0a56 7e05b083d3
commit ecbd5a5013
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/aws/resource_aws_dynamodb_table.go
View File

@ -208,7 +208,7 @@ func resourceAwsDynamoDbTableCreate(d *schema.ResourceData, meta interface{}) er
ProjectionType: aws.String(lsi["projection_type"].(string)), ProjectionType: aws.String(lsi["projection_type"].(string)),
} }
if lsi["projection_type"] != "ALL" { if lsi["projection_type"] == "INCLUDE" {
non_key_attributes := []*string{} non_key_attributes := []*string{}
for _, attr := range lsi["non_key_attributes"].([]interface{}) { for _, attr := range lsi["non_key_attributes"].([]interface{}) {
non_key_attributes = append(non_key_attributes, aws.String(attr.(string))) non_key_attributes = append(non_key_attributes, aws.String(attr.(string)))
@ -570,7 +570,7 @@ func createGSIFromData(data *map[string]interface{}) dynamodb.GlobalSecondaryInd
ProjectionType: aws.String((*data)["projection_type"].(string)), ProjectionType: aws.String((*data)["projection_type"].(string)),
} }
if (*data)["projection_type"] != "ALL" { if (*data)["projection_type"] == "INCLUDE" {
non_key_attributes := []*string{} non_key_attributes := []*string{}
for _, attr := range (*data)["non_key_attributes"].([]interface{}) { for _, attr := range (*data)["non_key_attributes"].([]interface{}) {
non_key_attributes = append(non_key_attributes, aws.String(attr.(string))) non_key_attributes = append(non_key_attributes, aws.String(attr.(string)))

9
builtin/providers/aws/resource_aws_dynamodb_table_test.go
View File

@ -251,7 +251,7 @@ resource "aws_dynamodb_table" "basic-dynamodb-table" {
range_key = "TestGSIRangeKey" range_key = "TestGSIRangeKey"
write_capacity = 10 write_capacity = 10
read_capacity = 10 read_capacity = 10
projection_type = "ALL" projection_type = "KEYS_ONLY"
} }
} }
` `
@ -279,6 +279,10 @@ resource "aws_dynamodb_table" "basic-dynamodb-table" {
name = "ReplacementGSIRangeKey" name = "ReplacementGSIRangeKey"
type = "N" type = "N"
} }
attribute {
name = "TestNonKeyAttribute"
type = "S"
}
local_secondary_index { local_secondary_index {
name = "TestTableLSI" name = "TestTableLSI"
range_key = "TestLSIRangeKey" range_key = "TestLSIRangeKey"
@ -290,7 +294,8 @@ resource "aws_dynamodb_table" "basic-dynamodb-table" {
range_key = "ReplacementGSIRangeKey" range_key = "ReplacementGSIRangeKey"
write_capacity = 5 write_capacity = 5
read_capacity = 5 read_capacity = 5
projection_type = "ALL" projection_type = "INCLUDE"
non_key_attributes = ["TestNonKeyAttribute"]
} }
} }
` `