fix(provisioner/terraform): ensure ordering rich parameters produces no nil values (#7824)

coadler · web-flow · commit 1ab245025004 · 2023-06-05T11:26:04.000-05:00
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -694,5 +694,21 @@ func orderedRichParametersResources(tfResourcesRichParameters []*tfjson.StateRes
 			}
 		}
 	}
+
+	// There's an edge case possible for us to have a parameter name that isn't
+	// present in the state, since the ordered names come statically from
+	// parsing the Terraform file. We need to filter out the nil values if there
+	// are any present.
+	if len(tfResourcesRichParameters) != len(orderedNames) {
+		nonNil := make([]*tfjson.StateResource, 0, len(ordered))
+		for _, resource := range ordered {
+			if resource != nil {
+				nonNil = append(nonNil, resource)
+			}
+		}
+
+		ordered = nonNil
+	}
+
 	return ordered
 }

Original file line number	Diff line number	Diff line change
`@@ -694,5 +694,21 @@ func orderedRichParametersResources(tfResourcesRichParameters []*tfjson.StateRes`
`694`	`694`	`}`
`695`	`695`	`}`
`696`	`696`	`}`
	`697`	`+`
	`698`	`+ // There's an edge case possible for us to have a parameter name that isn't`
	`699`	`+ // present in the state, since the ordered names come statically from`
	`700`	`+ // parsing the Terraform file. We need to filter out the nil values if there`
	`701`	`+ // are any present.`
	`702`	`+ if len(tfResourcesRichParameters) != len(orderedNames) {`
	`703`	`+ nonNil := make([]*tfjson.StateResource, 0, len(ordered))`
	`704`	`+ for _, resource := range ordered {`
	`705`	`+ if resource != nil {`
	`706`	`+ nonNil = append(nonNil, resource)`
	`707`	`+ }`
	`708`	`+ }`
	`709`	`+`
	`710`	`+ ordered = nonNil`
	`711`	`+ }`
	`712`	`+`
`697`	`713`	`return ordered`
`698`	`714`	`}`