r/aws_batch_job_definition: Suppress unnecessary environment variable…

… diffs
hashicorp · Nov 18, 2021 · 52f6bfa · 52f6bfa
1 parent 889a927
commit 52f6bfa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/internal/service/batch/container_properties.go b/internal/service/batch/container_properties.go
@@ -15,9 +15,7 @@ type containerProperties batch.ContainerProperties
 
 func (cp *containerProperties) Reduce() error {
 	// Deal with Environment objects which may be re-ordered in the API
-	sort.Slice(cp.Environment, func(i, j int) bool {
-		return aws.StringValue(cp.Environment[i].Name) < aws.StringValue(cp.Environment[j].Name)
-	})
+	cp.OrderEnvironmentVariables()
 
 	// Prevent difference of API response that adds an empty array when not configured during the request
 	if len(cp.Command) == 0 {
@@ -145,3 +143,9 @@ func EquivalentContainerPropertiesJSON(str1, str2 string) (bool, error) {
 
 	return equal, nil
 }
+
+func (cp *containerProperties) OrderEnvironmentVariables() {
+	sort.Slice(cp.Environment, func(i, j int) bool {
+		return aws.StringValue(cp.Environment[i].Name) < aws.StringValue(cp.Environment[j].Name)
+	})
+}
diff --git a/internal/service/batch/job_definition.go b/internal/service/batch/job_definition.go
@@ -42,7 +42,10 @@ func ResourceJobDefinition() *schema.Resource {
 				Optional: true,
 				ForceNew: true,
 				StateFunc: func(v interface{}) string {
-					json, _ := structure.NormalizeJsonString(v)
+					orderedProps, _ := expandBatchJobContainerProperties(v.(string))
+					(*containerProperties)(orderedProps).OrderEnvironmentVariables()
+					unnormalizedJson, _ := flattenBatchContainerProperties(orderedProps)
+					json, _ := structure.NormalizeJsonString(unnormalizedJson)
 					return json
 				},
 				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
@@ -245,6 +248,7 @@ func resourceJobDefinitionRead(d *schema.ResourceData, meta interface{}) error {
 
 	d.Set("arn", jobDefinition.JobDefinitionArn)
 
+	(*containerProperties)(jobDefinition.ContainerProperties).OrderEnvironmentVariables()
 	containerProperties, err := flattenBatchContainerProperties(jobDefinition.ContainerProperties)
 
 	if err != nil {