Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing duplicate local and output values in terraform(#10786) #10978

Merged
merged 1 commit into from
Mar 5, 2021
Merged

Removing duplicate local and output values in terraform(#10786) #10978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/existing_iam/kubernetes.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
locals {
cluster_name = "existing-iam.example.com"
master_autoscaling_group_ids = [aws_autoscaling_group.master-us-test-1a-masters-existing-iam-example-com.id, aws_autoscaling_group.master-us-test-1b-masters-existing-iam-example-com.id, aws_autoscaling_group.master-us-test-1c-masters-existing-iam-example-com.id]
master_security_group_ids = [aws_security_group.masters-existing-iam-example-com.id, aws_security_group.masters-existing-iam-example-com.id, aws_security_group.masters-existing-iam-example-com.id]
master_security_group_ids = [aws_security_group.masters-existing-iam-example-com.id]
node_autoscaling_group_ids = [aws_autoscaling_group.nodes-existing-iam-example-com.id]
node_security_group_ids = [aws_security_group.nodes-existing-iam-example-com.id]
node_subnet_ids = [aws_subnet.us-test-1a-existing-iam-example-com.id]
Expand All @@ -23,7 +23,7 @@ output "master_autoscaling_group_ids" {
}

output "master_security_group_ids" {
value = [aws_security_group.masters-existing-iam-example-com.id, aws_security_group.masters-existing-iam-example-com.id, aws_security_group.masters-existing-iam-example-com.id]
value = [aws_security_group.masters-existing-iam-example-com.id]
}

output "node_autoscaling_group_ids" {
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/ha/kubernetes.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
locals {
cluster_name = "ha.example.com"
master_autoscaling_group_ids = [aws_autoscaling_group.master-us-test-1a-masters-ha-example-com.id, aws_autoscaling_group.master-us-test-1b-masters-ha-example-com.id, aws_autoscaling_group.master-us-test-1c-masters-ha-example-com.id]
master_security_group_ids = [aws_security_group.masters-ha-example-com.id, aws_security_group.masters-ha-example-com.id, aws_security_group.masters-ha-example-com.id]
master_security_group_ids = [aws_security_group.masters-ha-example-com.id]
masters_role_arn = aws_iam_role.masters-ha-example-com.arn
masters_role_name = aws_iam_role.masters-ha-example-com.name
node_autoscaling_group_ids = [aws_autoscaling_group.nodes-ha-example-com.id]
Expand All @@ -27,7 +27,7 @@ output "master_autoscaling_group_ids" {
}

output "master_security_group_ids" {
value = [aws_security_group.masters-ha-example-com.id, aws_security_group.masters-ha-example-com.id, aws_security_group.masters-ha-example-com.id]
value = [aws_security_group.masters-ha-example-com.id]
}

output "masters_role_arn" {
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/launch_templates/kubernetes.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
locals {
cluster_name = "launchtemplates.example.com"
master_autoscaling_group_ids = [aws_autoscaling_group.master-us-test-1a-masters-launchtemplates-example-com.id, aws_autoscaling_group.master-us-test-1b-masters-launchtemplates-example-com.id, aws_autoscaling_group.master-us-test-1c-masters-launchtemplates-example-com.id]
master_security_group_ids = [aws_security_group.masters-launchtemplates-example-com.id, aws_security_group.masters-launchtemplates-example-com.id, aws_security_group.masters-launchtemplates-example-com.id]
master_security_group_ids = [aws_security_group.masters-launchtemplates-example-com.id]
masters_role_arn = aws_iam_role.masters-launchtemplates-example-com.arn
masters_role_name = aws_iam_role.masters-launchtemplates-example-com.name
node_autoscaling_group_ids = [aws_autoscaling_group.nodes-launchtemplates-example-com.id]
Expand All @@ -27,7 +27,7 @@ output "master_autoscaling_group_ids" {
}

output "master_security_group_ids" {
value = [aws_security_group.masters-launchtemplates-example-com.id, aws_security_group.masters-launchtemplates-example-com.id, aws_security_group.masters-launchtemplates-example-com.id]
value = [aws_security_group.masters-launchtemplates-example-com.id]
}

output "masters_role_arn" {
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/mixed_instances/kubernetes.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
locals {
cluster_name = "mixedinstances.example.com"
master_autoscaling_group_ids = [aws_autoscaling_group.master-us-test-1a-masters-mixedinstances-example-com.id, aws_autoscaling_group.master-us-test-1b-masters-mixedinstances-example-com.id, aws_autoscaling_group.master-us-test-1c-masters-mixedinstances-example-com.id]
master_security_group_ids = [aws_security_group.masters-mixedinstances-example-com.id, aws_security_group.masters-mixedinstances-example-com.id, aws_security_group.masters-mixedinstances-example-com.id]
master_security_group_ids = [aws_security_group.masters-mixedinstances-example-com.id]
masters_role_arn = aws_iam_role.masters-mixedinstances-example-com.arn
masters_role_name = aws_iam_role.masters-mixedinstances-example-com.name
node_autoscaling_group_ids = [aws_autoscaling_group.nodes-mixedinstances-example-com.id]
Expand All @@ -27,7 +27,7 @@ output "master_autoscaling_group_ids" {
}

output "master_security_group_ids" {
value = [aws_security_group.masters-mixedinstances-example-com.id, aws_security_group.masters-mixedinstances-example-com.id, aws_security_group.masters-mixedinstances-example-com.id]
value = [aws_security_group.masters-mixedinstances-example-com.id]
}

output "masters_role_arn" {
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
locals {
cluster_name = "mixedinstances.example.com"
master_autoscaling_group_ids = [aws_autoscaling_group.master-us-test-1a-masters-mixedinstances-example-com.id, aws_autoscaling_group.master-us-test-1b-masters-mixedinstances-example-com.id, aws_autoscaling_group.master-us-test-1c-masters-mixedinstances-example-com.id]
master_security_group_ids = [aws_security_group.masters-mixedinstances-example-com.id, aws_security_group.masters-mixedinstances-example-com.id, aws_security_group.masters-mixedinstances-example-com.id]
master_security_group_ids = [aws_security_group.masters-mixedinstances-example-com.id]
masters_role_arn = aws_iam_role.masters-mixedinstances-example-com.arn
masters_role_name = aws_iam_role.masters-mixedinstances-example-com.name
node_autoscaling_group_ids = [aws_autoscaling_group.nodes-mixedinstances-example-com.id]
Expand All @@ -27,7 +27,7 @@ output "master_autoscaling_group_ids" {
}

output "master_security_group_ids" {
value = [aws_security_group.masters-mixedinstances-example-com.id, aws_security_group.masters-mixedinstances-example-com.id, aws_security_group.masters-mixedinstances-example-com.id]
value = [aws_security_group.masters-mixedinstances-example-com.id]
}

output "masters_role_arn" {
Expand Down
9 changes: 6 additions & 3 deletions upup/pkg/fi/cloudup/terraform/target_hcl2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,12 @@ func writeLocalsOutputs(body *hclwrite.Body, outputs map[string]*terraformOutput
writeLiteral(outputBody, "value", v.Value)
writeLiteral(localsBody, tfName, v.Value)
} else {
SortLiterals(v.ValueArray)
writeLiteralList(outputBody, "value", v.ValueArray)
writeLiteralList(localsBody, tfName, v.ValueArray)
deduped, err := DedupLiterals(v.ValueArray)
if err != nil {
return err
}
writeLiteralList(outputBody, "value", deduped)
writeLiteralList(localsBody, tfName, deduped)
}

if existingOutputVars[tfName] {
Expand Down
21 changes: 21 additions & 0 deletions upup/pkg/fi/cloudup/terraform/target_hcl2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,27 @@ output "key1" {
},
errExpected: true,
},
{
name: "duplicate values",
values: map[string]*terraformOutputVariable{
"key1": {
Key: "key1",
ValueArray: []*Literal{
LiteralFromStringValue("value1"),
LiteralFromStringValue("value1"),
LiteralFromStringValue("value2"),
},
},
},
expected: `
locals {
key1 = ["value1", "value2"]
}

output "key1" {
value = ["value1", "value2"]
}`,
},
}
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
Expand Down
2 changes: 0 additions & 2 deletions upup/pkg/fi/cloudup/terraform/target_json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ func (t *TerraformTarget) finishJSON(taskMap map[string]fi.Task) error {
if v.Value != nil {
tfVar["value"] = v.Value
} else {
SortLiterals(v.ValueArray)
deduped, err := DedupLiterals(v.ValueArray)
if err != nil {
return err
Expand All @@ -94,7 +93,6 @@ func (t *TerraformTarget) finishJSON(taskMap map[string]fi.Task) error {
if v.Value != nil {
localVariables[tfName] = v.Value
} else {
SortLiterals(v.ValueArray)
deduped, err := DedupLiterals(v.ValueArray)
if err != nil {
return err
Expand Down