From 3d5cef3b8b928e499eae76f8e40fbaae6c35b6ac Mon Sep 17 00:00:00 2001
From: Kit Ewbank <Kit_Ewbank@hotmail.com>
Date: Fri, 9 Jun 2023 14:36:06 -0400
Subject: [PATCH] pipes: Use 'go-cmp' in unit tests.

---
 .../service/pipes/enrichment_parameters_test.go    | 10 +++++++---
 internal/service/pipes/source_parameters_test.go   | 14 ++++++++++----
 internal/service/pipes/target_parameters.go        |  4 ++--
 internal/service/pipes/target_parameters_test.go   | 10 +++++++---
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/internal/service/pipes/enrichment_parameters_test.go b/internal/service/pipes/enrichment_parameters_test.go
index 8b3d80af4512..bab249bfbb9d 100644
--- a/internal/service/pipes/enrichment_parameters_test.go
+++ b/internal/service/pipes/enrichment_parameters_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/service/pipes/types"
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/stretchr/testify/assert"
+	"github.com/google/go-cmp/cmp"
 )
 
 func Test_expandEnrichmentParameters(t *testing.T) {
@@ -68,7 +68,9 @@ func Test_expandEnrichmentParameters(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			got := expandEnrichmentParameters([]interface{}{tt.config})
 
-			assert.Equal(t, tt.expected, got)
+			if diff := cmp.Diff(got, tt.expected); diff != "" {
+				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
+			}
 		})
 	}
 }
@@ -137,7 +139,9 @@ func Test_flattenEnrichmentParameters(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			got := flattenEnrichmentParameters(tt.config)
 
-			assert.Equal(t, tt.expected, got)
+			if diff := cmp.Diff(got, tt.expected); diff != "" {
+				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
+			}
 		})
 	}
 }
diff --git a/internal/service/pipes/source_parameters_test.go b/internal/service/pipes/source_parameters_test.go
index 611e859364a2..f926d2a9087f 100644
--- a/internal/service/pipes/source_parameters_test.go
+++ b/internal/service/pipes/source_parameters_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/service/pipes/types"
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/stretchr/testify/assert"
 )
 
 func Test_expandSourceParameters(t *testing.T) {
@@ -544,7 +544,9 @@ func Test_expandSourceParameters(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			got := expandSourceParameters([]interface{}{tt.config})
 
-			assert.Equal(t, tt.expected, got)
+			if diff := cmp.Diff(got, tt.expected); diff != "" {
+				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
+			}
 		})
 	}
 }
@@ -1023,7 +1025,9 @@ func Test_flattenSourceParameters(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			got := flattenSourceParameters(tt.config)
 
-			assert.Equal(t, tt.expected, got)
+			if diff := cmp.Diff(got, tt.expected); diff != "" {
+				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
+			}
 		})
 	}
 }
@@ -1494,7 +1498,9 @@ func Test_expandSourceUpdateParameters(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			got := expandSourceUpdateParameters([]interface{}{tt.config})
 
-			assert.Equal(t, tt.expected, got)
+			if diff := cmp.Diff(got, tt.expected); diff != "" {
+				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
+			}
 		})
 	}
 }
diff --git a/internal/service/pipes/target_parameters.go b/internal/service/pipes/target_parameters.go
index 5177fe8f703c..92f8a263a384 100644
--- a/internal/service/pipes/target_parameters.go
+++ b/internal/service/pipes/target_parameters.go
@@ -1693,7 +1693,7 @@ func flattenTargetBatchContainerOverrides(parameters *types.BatchContainerOverri
 	config := make(map[string]interface{})
 
 	if parameters.Command != nil {
-		config["command"] = flex.FlattenStringValueSet(parameters.Command)
+		config["command"] = flex.FlattenStringValueList(parameters.Command)
 	}
 	if parameters.InstanceType != nil {
 		config["instance_type"] = aws.ToString(parameters.InstanceType)
@@ -1891,7 +1891,7 @@ func flattenTargetECSTaskOverrideContainerOverride(parameters types.EcsContainer
 		config["name"] = aws.ToString(parameters.Name)
 	}
 	if parameters.Command != nil {
-		config["command"] = flex.FlattenStringValueSet(parameters.Command)
+		config["command"] = flex.FlattenStringValueList(parameters.Command)
 	}
 
 	var environmentValues []map[string]interface{}
diff --git a/internal/service/pipes/target_parameters_test.go b/internal/service/pipes/target_parameters_test.go
index a525f9fa2627..71ea43ffaafe 100644
--- a/internal/service/pipes/target_parameters_test.go
+++ b/internal/service/pipes/target_parameters_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/pipes/types"
+	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/stretchr/testify/assert"
 )
 
 func Test_expandTargetParameters(t *testing.T) {
@@ -542,7 +542,9 @@ func Test_expandTargetParameters(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			got := expandTargetParameters([]interface{}{tt.config})
 
-			assert.Equal(t, tt.expected, got)
+			if diff := cmp.Diff(got, tt.expected); diff != "" {
+				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
+			}
 		})
 	}
 }
@@ -1104,7 +1106,9 @@ func Test_flattenTargetParameters(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			got := flattenTargetParameters(tt.config)
 
-			assert.Equal(t, tt.expected, got)
+			if diff := cmp.Diff(got, tt.expected); diff != "" {
+				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
+			}
 		})
 	}
 }